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

kill testnospec

Browse source
This commit is contained in:
Arne Döring 2018-11-28 11:09:55 +01:00 • committed by Araq
commit dec863a85a
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testament/categories.nim
View file

@ -232,7 +232,7 @@ proc asyncTests(r: var TResults, cat: Category, options: string) =
# ------------------------- debugger tests ------------------------------------ # ------------------------- debugger tests ------------------------------------
proc debuggerTests(r: var TResults, cat: Category, options: string) = proc debuggerTests(r: var TResults, cat: Category, options: string) =
testNoSpec r, makeTest("tools/nimgrep", options & " --debugger:on", cat) testSpec r, makeTest("tools/nimgrep", options & " --debugger:on", cat)
# ------------------------- JS tests ------------------------------------------ # ------------------------- JS tests ------------------------------------------
@ -355,11 +355,15 @@ proc manyLoc(r: var TResults, cat: Category, options: string) =
if dir.endsWith"named_argument_bug": continue if dir.endsWith"named_argument_bug": continue
let mainfile = findMainFile(dir) let mainfile = findMainFile(dir)
if mainfile != "": if mainfile != "":
testNoSpec r, makeTest(mainfile, options, cat) var test = makeTest(mainfile, options, cat)
test.spec.action = actionCompile
testSpec r, test
proc compileExample(r: var TResults, pattern, options: string, cat: Category) = proc compileExample(r: var TResults, pattern, options: string, cat: Category) =
for test in os.walkFiles(pattern): for test in os.walkFiles(pattern):
testNoSpec r, makeTest(test, options, cat) var test = makeTest(test, options, cat)
test.spec.action = actionCompile
testSpec r, test
proc testStdlib(r: var TResults, pattern, options: string, cat: Category) = proc testStdlib(r: var TResults, pattern, options: string, cat: Category) =
for testFile in os.walkFiles(pattern): for testFile in os.walkFiles(pattern):

8
testament/tester.nim
View file

@ -443,14 +443,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
cmpMsgs(r, expected, given, test, target) cmpMsgs(r, expected, given, test, target)
continue continue
proc testNoSpec(r: var TResults, test: TTest, target = targetC) =
# does not extract the spec because the file is not supposed to have any
#let tname = test.name.addFileExt(".nim")
inc(r.total)
let given = callCompiler(cmdTemplate(), test.name, test.options, target)
r.addResult(test, target, "", given.msg, given.err)
if given.err == reSuccess: inc(r.passed)
proc testC(r: var TResults, test: TTest, action: TTestAction) = proc testC(r: var TResults, test: TTest, action: TTestAction) =
# runs C code. Doesn't support any specs, just goes by exit code. # runs C code. Doesn't support any specs, just goes by exit code.
let tname = test.name.addFileExt(".c") let tname = test.name.addFileExt(".c")