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

Treat unitest's default esc.seq. output as empty.

Browse source
This commit is contained in:
Oscar Campbell 2015-06-04 22:53:39 +02:00
commit 0a810fd10f
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/testament/tester.nim
View file

@ -286,6 +286,7 @@ proc testSpec(r: var TResults, test: TTest) =
let (buf, exitCode) = execCmdEx(exeCmd) let (buf, exitCode) = execCmdEx(exeCmd)
let bufB = if expected.sortoutput: makeDeterministic(strip(buf.string)) let bufB = if expected.sortoutput: makeDeterministic(strip(buf.string))
else: strip(buf.string) else: strip(buf.string)
let expectedOut = strip(expected.outp)
if exitCode != expected.exitCode: if exitCode != expected.exitCode:
r.addResult(test, "exitcode: " & $expected.exitCode, r.addResult(test, "exitcode: " & $expected.exitCode,
@ -294,11 +295,13 @@ proc testSpec(r: var TResults, test: TTest) =
reExitCodesDiffer) reExitCodesDiffer)
return return
if bufB != strip(expected.outp): # This is a bit ugly atm.
if not (expected.substr and expected.outp in bufB): if bufB != expectedOut:
given.err = reOutputsDiffer if not (expected.substr and expectedOut in bufB):
r.addResult(test, expected.outp, bufB, reOutputsDiffer) if not (expectedOut == "" and bufB == "\27[0m"):
return given.err = reOutputsDiffer
r.addResult(test, expected.outp, bufB, reOutputsDiffer)
return
compilerOutputTests(test, given, expected, r) compilerOutputTests(test, given, expected, r)
return return