diff options
author | Oscar Campbell <oscar@campbell.nu> | 2015-06-04 22:53:39 +0200 |
---|---|---|
committer | Oscar Campbell <oscar@campbell.nu> | 2015-06-04 22:53:39 +0200 |
commit | 0a810fd10f81e11e6b738a18ff18e62c89479436 (patch) | |
tree | d02962848514c6ba16b294d9ba84487dfe4272d2 | |
parent | cdf631c508d4e7d1968ec3b238e29de17df670d7 (diff) | |
download | Nim-0a810fd10f81e11e6b738a18ff18e62c89479436.tar.gz |
Treat unitest's default esc.seq. output as empty.
-rw-r--r-- | tests/testament/tester.nim | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim index ebfea591a..2c4460395 100644 --- a/tests/testament/tester.nim +++ b/tests/testament/tester.nim @@ -286,6 +286,7 @@ proc testSpec(r: var TResults, test: TTest) = let (buf, exitCode) = execCmdEx(exeCmd) let bufB = if expected.sortoutput: makeDeterministic(strip(buf.string)) else: strip(buf.string) + let expectedOut = strip(expected.outp) if exitCode != expected.exitCode: r.addResult(test, "exitcode: " & $expected.exitCode, @@ -294,11 +295,13 @@ proc testSpec(r: var TResults, test: TTest) = reExitCodesDiffer) return - if bufB != strip(expected.outp): - if not (expected.substr and expected.outp in bufB): - given.err = reOutputsDiffer - r.addResult(test, expected.outp, bufB, reOutputsDiffer) - return + # This is a bit ugly atm. + if bufB != expectedOut: + if not (expected.substr and expectedOut in bufB): + if not (expectedOut == "" and bufB == "\27[0m"): + given.err = reOutputsDiffer + r.addResult(test, expected.outp, bufB, reOutputsDiffer) + return compilerOutputTests(test, given, expected, r) return |