summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorSimon Hafner <hafnersimon@gmail.com>2013-03-16 07:21:31 -0500
committerSimon Hafner <hafnersimon@gmail.com>2013-03-16 07:21:31 -0500
commit129fcb327fb1900af0d9e55a668d7808344d29f3 (patch)
treeab3531d95cc93bbca51c590ec104c05bf337526b /tests
parent1d9f680b788499fc3c3d1a9571ed89ab479c4e86 (diff)
downloadNim-129fcb327fb1900af0d9e55a668d7808344d29f3.tar.gz
used correct syntax for multiline results in tests
And also modified the runner to actually run them in JS.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/run/tfinally.nim4
-rwxr-xr-xtests/run/tfinally2.nim4
-rw-r--r--tests/specials.nim8
3 files changed, 6 insertions, 10 deletions
diff --git a/tests/run/tfinally.nim b/tests/run/tfinally.nim
index 2522dd0e4..273aac72b 100755
--- a/tests/run/tfinally.nim
+++ b/tests/run/tfinally.nim
@@ -1,8 +1,8 @@
 discard """
   file: "tfinally.nim"
-  output: "came
+  output: '''came
 here
-3"
+3'''
 """
 # Test return in try statement:
 
diff --git a/tests/run/tfinally2.nim b/tests/run/tfinally2.nim
index af94aee5b..e1e8d4c7e 100755
--- a/tests/run/tfinally2.nim
+++ b/tests/run/tfinally2.nim
@@ -1,9 +1,9 @@
 discard """
   file: "tfinally2.nim"
-  output: "A
+  output: '''A
 B
 C
-D"
+D'''
 """
 # Test break in try statement:
 
diff --git a/tests/specials.nim b/tests/specials.nim
index 1818497a4..b5c49ec3c 100644
--- a/tests/specials.nim
+++ b/tests/specials.nim
@@ -176,14 +176,10 @@ proc runJsTests(r: var TResults, options: string) =
     runSingleTest(r, filename, options & " -d:nodejs", 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"):
     test(t)
-  test "tests/run/tactiontable"
-  test "tests/run/tmultim1"
-  test "tests/run/tmultim3"
-  test "tests/run/tmultim4"
+  for testfile in ["texceptions", "texcpt1", "texcsub", "tfinally", "tfinally2", "tfinally3", "tactiontable", "tmultim1", "tmultim3", "tmultim4"]:
+    test "tests/run/" & testfile & ".nim"
 
 # ------------------------- register special tests here -----------------------
 proc runSpecialTests(r: var TResults, options: string) =