jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

one error less

Browse source
This commit is contained in:
Arne Döring 2018-11-28 02:33:39 +01:00 • committed by Araq
commit da78c3d04d
3 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
testament/categories.nim
View file

@ -476,7 +476,8 @@ proc processSingleTest(r: var TResults, cat: Category, options, test: string) =
let test = "tests" & DirSep &.? cat.string / test let test = "tests" & DirSep &.? cat.string / test
let target = if cat.string.normalize == "js": targetJS else: targetC 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" else: echo "[Warning] - ", test, " test does not exist"
proc processCategory(r: var TResults, cat: Category, options: string) = proc processCategory(r: var TResults, cat: Category, options: string) =

8
testament/specs.nim
View file

@ -111,8 +111,9 @@ proc parseTargets*(value: string): set[TTarget] =
proc parseSpec*(filename: string): TSpec = proc parseSpec*(filename: string): TSpec =
result = defaultSpec() result = defaultSpec()
result.file = filename result.file = filename
var ss = newStringStream(extractSpec(filename)) let specStr = extractSpec(filename)
var p {.inject.}: CfgParser var ss = newStringStream(specStr)
var p: CfgParser
open(p, ss, filename, 1) open(p, ss, filename, 1)
while true: while true:
var e = next(p) var e = next(p)
@ -215,3 +216,6 @@ proc parseSpec*(filename: string): TSpec =
of cfgEof: of cfgEof:
break break
close(p) close(p)
if result.err == reIgnored:
echo specStr

15
testament/tester.nim
View file

@ -348,7 +348,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
var expected = test.spec var expected = test.spec
if expected.err == reIgnored: if expected.err == reIgnored:
echo expected
# targetC is a lie # targetC is a lie
r.addResult(test, targetC, "", "", reIgnored) r.addResult(test, targetC, "", "", reIgnored)
inc(r.skipped) inc(r.skipped)
@ -366,10 +365,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
for target in expected.targets: for target in expected.targets:
inc(r.total) inc(r.total)
if target notin targets:
r.addResult(test, target, "", "", reIgnored)
inc(r.skipped)
continue
case expected.action case expected.action
of actionCompile: 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, var given = callCompiler(expected.cmd, test.name, test.options,
target) 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: if given.err != reSuccess:
r.addResult(test, target, "", given.msg, given.err) r.addResult(test, target, "", given.msg, given.err)
continue continue
@ -395,10 +384,10 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
let isJsTarget = target == targetJS let isJsTarget = target == targetJS
var exeFile: string var exeFile: string
if isJsTarget: if isJsTarget:
let file = addFileExt(test.name, "js") let file = changeFileExt(test.name, "js")
exeFile = nimcacheDir(test.name, test.options, target) / file exeFile = nimcacheDir(test.name, test.options, target) / file
else: else:
exeFile = addFileExt(test.name, ExeExt) exeFile = changeFileExt(test.name, ExeExt)
if not existsFile(exeFile): if not existsFile(exeFile):
r.addResult(test, target, expected.outp, "executable not found", reExeNotFound) r.addResult(test, target, expected.outp, "executable not found", reExeNotFound)