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

minor changes

Browse source
This commit is contained in:
Arne Döring 2018-11-28 00:05:15 +01:00 • committed by Araq
commit 7f6feb6034
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
testament/tester.nim
View file

@ -353,7 +353,6 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
else: else:
specDefaults expected specDefaults expected
expected.action = actionRunNoSpec expected.action = actionRunNoSpec
expected.outputCheck = ocIgnore # this is default so it is unnecessary
if expected.err == reIgnored: if expected.err == reIgnored:
# targetC is a lie # targetC is a lie
@ -498,9 +497,7 @@ proc testExec(r: var TResults, test: TTest) =
if given.err == reSuccess: inc(r.passed) if given.err == reSuccess: inc(r.passed)
r.addResult(test, targetC, "", given.msg, given.err) r.addResult(test, targetC, "", given.msg, given.err)
proc makeTest(test, options: string, cat: Category, proc makeTest(test, options: string, cat: Category, env: string = ""): TTest =
env: string = ""): TTest =
# start with 'actionCompile', will be overwritten in the spec:
result = TTest(cat: cat, name: test, options: options, startTime: epochTime()) result = TTest(cat: cat, name: test, options: options, startTime: epochTime())
when defined(windows): when defined(windows):
@ -526,10 +523,8 @@ proc main() =
backend.open() backend.open()
var optPrintResults = false var optPrintResults = false
var optFailing = false var optFailing = false
var targetsStr = "" var targetsStr = ""
var p = initOptParser() var p = initOptParser()
p.next() p.next()
while p.kind == cmdLongoption: while p.kind == cmdLongoption:
@ -544,16 +539,18 @@ proc main() =
of "directory": of "directory":
setCurrentDir(p.val.string) setCurrentDir(p.val.string)
of "colors": of "colors":
if p.val.string == "on": case p.val.string:
of "on":
useColors = true useColors = true
elif p.val.string == "off": of "off":
useColors = false useColors = false
else: else:
quit Usage quit Usage
else: else:
quit Usage quit Usage
p.next() p.next()
if p.kind != cmdArgument: quit Usage if p.kind != cmdArgument:
quit Usage
var action = p.key.string.normalize var action = p.key.string.normalize
p.next() p.next()
var r = initResults() var r = initResults()