diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2016-06-09 17:34:51 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2016-06-09 17:34:57 +0200 |
commit | 76c8d6164b10846f18dbd441e4d1db5d501da09d (patch) | |
tree | 61127dbd248c2bfead73ce1e57e087a48bb858e4 /tests | |
parent | 0ea65a824d61dcfeb93193f38745667880943ba3 (diff) | |
download | Nim-76c8d6164b10846f18dbd441e4d1db5d501da09d.tar.gz |
added 'koch testinstall' command; more installer related bugfixes
Diffstat (limited to 'tests')
-rw-r--r-- | tests/async/tasynceverror.nim | 4 | ||||
-rw-r--r-- | tests/testament/specs.nim | 6 | ||||
-rw-r--r-- | tests/testament/tester.nim | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/tests/async/tasynceverror.nim b/tests/async/tasynceverror.nim index fd6d05c60..dd05c831b 100644 --- a/tests/async/tasynceverror.nim +++ b/tests/async/tasynceverror.nim @@ -1,9 +1,9 @@ discard """ file: "tasynceverror.nim" exitcode: 1 - outputsub: "Error: unhandled exception: Connection reset by peer" + outputsub: "Error: unhandled exception: " """ - +# error message is actually different on OSX import asyncdispatch, asyncnet, diff --git a/tests/testament/specs.nim b/tests/testament/specs.nim index 3f40a5342..b9519c70f 100644 --- a/tests/testament/specs.nim +++ b/tests/testament/specs.nim @@ -155,7 +155,11 @@ proc parseSpec*(filename: string): TSpec = result.nimout = e.value of "disabled": if parseCfgBool(e.value): result.err = reIgnored - of "cmd": result.cmd = e.value + of "cmd": + if e.value.startsWith("nim "): + result.cmd = "compiler" / e.value + else: + result.cmd = e.value of "ccodecheck": result.ccodeCheck = e.value of "target", "targets": for v in e.value.normalize.split: diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim index da1c6fc2d..9a253d0ff 100644 --- a/tests/testament/tester.nim +++ b/tests/testament/tester.nim @@ -284,6 +284,7 @@ proc testSpec(r: var TResults, test: TTest) = return let tname = test.name.addFileExt(".nim") + #echo "TESTING ", tname inc(r.total) var expected: TSpec if test.action != actionRunNoSpec: |