used correct syntax for multiline results in tests

And also modified the runner to actually run them in JS.
This commit is contained in:
Simon Hafner 2013-03-16 07:21:31 -05:00
commit 129fcb327f
3 changed files with 6 additions and 10 deletions

View file

@ -1,8 +1,8 @@
discard """ discard """
file: "tfinally.nim" file: "tfinally.nim"
output: "came output: '''came
here here
3" 3'''
""" """
# Test return in try statement: # Test return in try statement:

View file

@ -1,9 +1,9 @@
discard """ discard """
file: "tfinally2.nim" file: "tfinally2.nim"
output: "A output: '''A
B B
C C
D" D'''
""" """
# Test break in try statement: # Test break in try statement:

View file

@ -176,14 +176,10 @@ proc runJsTests(r: var TResults, options: string) =
runSingleTest(r, filename, options & " -d:nodejs", targetJS) runSingleTest(r, filename, options & " -d:nodejs", targetJS)
runSingleTest(r, filename, options & " -d:nodejs -d:release", targetJS) runSingleTest(r, filename, options & " -d:nodejs -d:release", targetJS)
# texceptions, texcpt1, texcsub, tfinally, tfinally2,
# tfinally3
for t in os.walkFiles("tests/js/t*.nim"): for t in os.walkFiles("tests/js/t*.nim"):
test(t) test(t)
test "tests/run/tactiontable" for testfile in ["texceptions", "texcpt1", "texcsub", "tfinally", "tfinally2", "tfinally3", "tactiontable", "tmultim1", "tmultim3", "tmultim4"]:
test "tests/run/tmultim1" test "tests/run/" & testfile & ".nim"
test "tests/run/tmultim3"
test "tests/run/tmultim4"
# ------------------------- register special tests here ----------------------- # ------------------------- register special tests here -----------------------
proc runSpecialTests(r: var TResults, options: string) = proc runSpecialTests(r: var TResults, options: string) =