diff options
| -rw-r--r-- | testament/categories.nim | 3 | ||||
| -rw-r--r-- | testament/specs.nim | 8 | ||||
| -rw-r--r-- | testament/tester.nim | 15 |
3 files changed, 10 insertions, 16 deletions
diff --git a/testament/categories.nim b/testament/categories.nim index b641430a1..38f61ce33 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -476,7 +476,8 @@ proc processSingleTest(r: var TResults, cat: Category, options, test: string) = let test = "tests" & DirSep &.? cat.string / test let target = if cat.string.normalize == "js": targetJS else: targetC - if existsFile(test): testSpec r, makeTest(test, options, cat), {target} + if existsFile(test): + testSpec r, makeTest(test, options, cat), {target} else: echo "[Warning] - ", test, " test does not exist" proc processCategory(r: var TResults, cat: Category, options: string) = diff --git a/testament/specs.nim b/testament/specs.nim index 9b2347bf9..3cfddc414 100644 --- a/testament/specs.nim +++ b/testament/specs.nim @@ -111,8 +111,9 @@ proc parseTargets*(value: string): set[TTarget] = proc parseSpec*(filename: string): TSpec = result = defaultSpec() result.file = filename - var ss = newStringStream(extractSpec(filename)) - var p {.inject.}: CfgParser + let specStr = extractSpec(filename) + var ss = newStringStream(specStr) + var p: CfgParser open(p, ss, filename, 1) while true: var e = next(p) @@ -215,3 +216,6 @@ proc parseSpec*(filename: string): TSpec = of cfgEof: break close(p) + + if result.err == reIgnored: + echo specStr diff --git a/testament/tester.nim b/testament/tester.nim index d8c0f2e11..111b701be 100644 --- a/testament/tester.nim +++ b/testament/tester.nim @@ -348,7 +348,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) = var expected = test.spec if expected.err == reIgnored: - echo expected # targetC is a lie r.addResult(test, targetC, "", "", reIgnored) inc(r.skipped) @@ -366,10 +365,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) = for target in expected.targets: inc(r.total) - if target notin targets: - r.addResult(test, target, "", "", reIgnored) - inc(r.skipped) - continue case expected.action of actionCompile: @@ -382,12 +377,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) = var given = callCompiler(expected.cmd, test.name, test.options, target) - # echo "expected.cmd: ", expected.cmd - # echo "nimout: ", given.nimout - # echo "outp: ", given.outp - # echo "msg: ", given.msg - # echo "err: ", given.err - if given.err != reSuccess: r.addResult(test, target, "", given.msg, given.err) continue @@ -395,10 +384,10 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) = let isJsTarget = target == targetJS var exeFile: string if isJsTarget: - let file = addFileExt(test.name, "js") + let file = changeFileExt(test.name, "js") exeFile = nimcacheDir(test.name, test.options, target) / file else: - exeFile = addFileExt(test.name, ExeExt) + exeFile = changeFileExt(test.name, ExeExt) if not existsFile(exeFile): r.addResult(test, target, expected.outp, "executable not found", reExeNotFound) |