enable weave (#19363) [backport:1.6]

* enable weave
* workaround CI
This commit is contained in:
flywind 2022-01-20 20:59:36 +08:00 • committed by GitHub
commit 927fa890ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View file

@ -48,8 +48,13 @@ proc addForwardedProc(m: BModule, prc: PSym) =
m.g.forwardedProcs.add(prc) m.g.forwardedProcs.add(prc)
proc findPendingModule(m: BModule, s: PSym): BModule = proc findPendingModule(m: BModule, s: PSym): BModule =
# TODO fixme
if m.config.symbolFiles == v2Sf:
let ms = s.itemId.module #getModule(s) let ms = s.itemId.module #getModule(s)
result = m.g.modules[ms] result = m.g.modules[ms]
else:
var ms = getModule(s)
result = m.g.modules[ms.position]
proc initLoc(result: var TLoc, k: TLocKind, lode: PNode, s: TStorageLoc) = proc initLoc(result: var TLoc, k: TLocKind, lode: PNode, s: TStorageLoc) =
result.k = k result.k = k

View file

@ -157,7 +157,7 @@ pkg "tiny_sqlite"
pkg "unicodedb", "nim c -d:release -r tests/tests.nim" pkg "unicodedb", "nim c -d:release -r tests/tests.nim"
pkg "unicodeplus", "nim c -d:release -r tests/tests.nim" pkg "unicodeplus", "nim c -d:release -r tests/tests.nim"
pkg "unpack" pkg "unpack"
pkg "weave", "nimble test_gc_arc", allowFailure = true pkg "weave", "nimble test_gc_arc"
pkg "websocket", "nim c websocket.nim" pkg "websocket", "nim c websocket.nim"
pkg "winim", "nim c winim.nim" pkg "winim", "nim c winim.nim"
pkg "with" pkg "with"