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

better messages for nimout

Browse source
This commit is contained in:
Simon Hafner 2015-03-05 16:15:28 -06:00
commit fb8c0280bd
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tests/testament/tester.nim
View file

@ -141,7 +141,7 @@ proc generatedFile(path, name: string, target: TTarget): string =
(if target == targetJS: path.splitPath.tail & "_" else: "compiler_") & (if target == targetJS: path.splitPath.tail & "_" else: "compiler_") &
name.changeFileExt(ext) name.changeFileExt(ext)
proc codegenCheck(test: TTest, check: string, given: var TSpec) = proc codegenCheck(test: TTest, check: string, given: var TSpec, r: var TResults) =
if check.len > 0: if check.len > 0:
try: try:
let (path, name, ext2) = test.name.splitFile let (path, name, ext2) = test.name.splitFile
@ -154,19 +154,29 @@ proc codegenCheck(test: TTest, check: string, given: var TSpec) =
given.err = reInvalidPeg given.err = reInvalidPeg
except IOError: except IOError:
given.err = reCodeNotFound given.err = reCodeNotFound
r.addResult(test, "", given.msg, given.err)
proc nimoutCheck(test: TTest; expectedNimout: string; given: var TSpec) = proc nimoutCheck(test: TTest; expectedNimout: string; given: var TSpec, r: var TResults) =
if expectedNimout.len > 0: if expectedNimout.len > 0:
let exp = expectedNimout.strip.replace("\C\L", "\L") let exp = expectedNimout.strip.replace("\C\L", "\L")
let giv = given.nimout.strip.replace("\C\L", "\L") let giv = given.nimout.strip.replace("\C\L", "\L")
if exp notin giv: if exp notin giv:
given.err = reMsgsDiffer given.err = reMsgsDiffer
r.addResult(test, exp, giv, given.err)
proc makeDeterministic(s: string): string = proc makeDeterministic(s: string): string =
var x = splitLines(s) var x = splitLines(s)
sort(x, system.cmp) sort(x, system.cmp)
result = join(x, "\n") result = join(x, "\n")
proc compilerOutputTests(test: TTest, given: var TSpec, expected: TSpec, r: var TResults) =
if given.err == reSuccess:
codegenCheck(test, expected.ccodeCheck, given, r)
nimoutCheck(test, expected.nimout, given, r)
if given.err == reSuccess: inc(r.passed)
proc testSpec(r: var TResults, test: TTest) = proc testSpec(r: var TResults, test: TTest) =
# major entry point for a single test # major entry point for a single test
let tname = test.name.addFileExt(".nim") let tname = test.name.addFileExt(".nim")
@ -179,13 +189,9 @@ proc testSpec(r: var TResults, test: TTest) =
else: else:
case expected.action case expected.action
of actionCompile: of actionCompile:
var given = callCompiler(expected.cmd, test.name, test.options, var given = callCompiler(expected.cmd, test.name,
test.target) test.options & " --hint[Path]:off --hint[Processing]:off", test.target)
if given.err == reSuccess: compilerOutputTests(test, given, expected, r)
codegenCheck(test, expected.ccodeCheck, given)
nimoutCheck(test, expected.nimout, given)
r.addResult(test, "", given.msg, given.err)
if given.err == reSuccess: inc(r.passed)
of actionRun: of actionRun:
var given = callCompiler(expected.cmd, test.name, test.options, var given = callCompiler(expected.cmd, test.name, test.options,
test.target) test.target)
@ -215,11 +221,7 @@ proc testSpec(r: var TResults, test: TTest) =
if bufB != strip(expected.outp): if bufB != strip(expected.outp):
if not (expected.substr and expected.outp in bufB): if not (expected.substr and expected.outp in bufB):
given.err = reOutputsDiffer given.err = reOutputsDiffer
if given.err == reSuccess: compilerOutputTests(test, given, expected, r)
codeGenCheck(test, expected.ccodeCheck, given)
nimoutCheck(test, expected.nimout, given)
if given.err == reSuccess: inc(r.passed)
r.addResult(test, expected.outp, buf.string, given.err)
else: else:
r.addResult(test, expected.outp, "executable not found", reExeNotFound) r.addResult(test, expected.outp, "executable not found", reExeNotFound)
of actionReject: of actionReject: