diff options
author | Araq <rumpf_a@web.de> | 2014-05-30 17:04:39 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-05-30 17:04:39 +0200 |
commit | bea1761da1195acb883b34105ec9a834f2a10c2e (patch) | |
tree | 5973ab838141301aefe5f9b1bd5d2a6674b23535 /tests | |
parent | ea16aca09ec47e3d4393437dea4f398922acaba0 (diff) | |
download | Nim-bea1761da1195acb883b34105ec9a834f2a10c2e.tar.gz |
tester works again
Diffstat (limited to 'tests')
-rw-r--r-- | tests/parallel/tsysspawnbadarg.nim | 4 | ||||
-rw-r--r-- | tests/testament/tester.nim | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/parallel/tsysspawnbadarg.nim b/tests/parallel/tsysspawnbadarg.nim index 120975ed5..ad798a7d3 100644 --- a/tests/parallel/tsysspawnbadarg.nim +++ b/tests/parallel/tsysspawnbadarg.nim @@ -1,9 +1,9 @@ discard """ - line: 7 + line: 9 errormsg: "'spawn' takes a call expression" cmd: "nimrod $target --threads:on $options $file" """ import threadpool -spawn(1) +let foo = spawn(1) diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim index adf9785e0..fc6b4ff95 100644 --- a/tests/testament/tester.nim +++ b/tests/testament/tester.nim @@ -11,7 +11,7 @@ import parseutils, strutils, pegs, os, osproc, streams, parsecfg, json, - marshal, backend, parseopt, specs, htmlgen, browsers, terminal, sequtils, + marshal, backend, parseopt, specs, htmlgen, browsers, terminal, algorithm const @@ -152,7 +152,7 @@ proc codegenCheck(test: TTest, check: string, given: var TSpec) = given.err = reCodeNotFound proc makeDeterministic(s: string): string = - var x = toSeq(s.lines) + var x = splitLines(s) sort(x, system.cmp) result = join(x, "\n") @@ -200,7 +200,7 @@ proc testSpec(r: var TResults, test: TTest) = var bufB = strip(buf.string) if expected.sortoutput: bufB = makeDeterministic(bufB) if bufB != strip(expected.outp): - if not (expected.substr and expected.outp in buf.string): + if not (expected.substr and expected.outp in bufB): given.err = reOutputsDiffer if given.err == reSuccess: codeGenCheck(test, expected.ccodeCheck, given) |