WebAssembly · sunfishcode · Oct 12, 2015
diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py
@@ -9,7 +9,7 @@
 
 class RunTests(unittest.TestCase):
   def _runTestFile(self, shortName, fileName, interpreterPath):
-    logPath = fileName.replace("test/", "test/output/").replace(".wast", ".wast.log")
+    logPath = fileName.replace("../testsuite/", "../testsuite/output/").replace(".wast", ".wast.log")
     try:
       os.remove(logPath)
     except OSError:
@@ -20,7 +20,7 @@ def _runTestFile(self, shortName, fileName, interpreterPath):
     self.assertEqual(0, exitCode, "test runner failed with exit code %i" % exitCode)
 
     try:
-      expected = open(fileName.replace("test/", "test/expected-output/").replace(".wast", ".wast.log"))
+      expected = open(fileName.replace("../testsuite/", "../testsuite/expected-output/").replace(".wast", ".wast.log"))
     except IOError:
       # print("// WARNING: No expected output found for %s" % fileName)
       return
@@ -39,7 +39,9 @@ def generate_test_case(rec):
 
 def generate_test_cases(cls, interpreterPath, files):
   for fileName in files:
-    attrName = fileName
+    # The test harness needs test names to begin with "test/" regardless of
+    # their actual path.
+    attrName = fileName.replace("../testsuite", "test/")
     rec = (attrName, fileName, interpreterPath)
     testCase = generate_test_case(rec)
     setattr(cls, attrName, testCase)
@@ -61,7 +63,7 @@ def rebuild_interpreter(path):
   interpreterPath = os.path.abspath("./wasm")
 
   try:
-    os.makedirs("test/output/")
+    os.makedirs("../testsuite/output/")
   except OSError:
     pass
 
@@ -72,6 +74,6 @@ def rebuild_interpreter(path):
   else:
     find_interpreter(interpreterPath)
 
-  testFiles = glob.glob("test/*.wast")
+  testFiles = glob.glob("../testsuite/*.wast")
   generate_test_cases(RunTests, interpreterPath, testFiles)
   unittest.main()
diff --git a/ml-proto/test/.gitignore → testsuite/.gitignore b/ml-proto/test/.gitignore → testsuite/.gitignore
diff --git a/ml-proto/test/conversions.wast → testsuite/conversions.wast b/ml-proto/test/conversions.wast → testsuite/conversions.wast
diff --git a/ml-proto/test/endianness.wast → testsuite/endianness.wast b/ml-proto/test/endianness.wast → testsuite/endianness.wast
diff --git a/...oto/test/expected-output/imports.wast.log → testsuite/expected-output/imports.wast.log b/...oto/test/expected-output/imports.wast.log → testsuite/expected-output/imports.wast.log
diff --git a/...est/expected-output/store_retval.wast.log → ...ite/expected-output/store_retval.wast.log b/...est/expected-output/store_retval.wast.log → ...ite/expected-output/store_retval.wast.log
diff --git a/ml-proto/test/exports.wast → testsuite/exports.wast b/ml-proto/test/exports.wast → testsuite/exports.wast
diff --git a/ml-proto/test/f32.wast → testsuite/f32.wast b/ml-proto/test/f32.wast → testsuite/f32.wast
diff --git a/ml-proto/test/f32_cmp.wast → testsuite/f32_cmp.wast b/ml-proto/test/f32_cmp.wast → testsuite/f32_cmp.wast
diff --git a/ml-proto/test/f64.wast → testsuite/f64.wast b/ml-proto/test/f64.wast → testsuite/f64.wast
diff --git a/ml-proto/test/f64_cmp.wast → testsuite/f64_cmp.wast b/ml-proto/test/f64_cmp.wast → testsuite/f64_cmp.wast
diff --git a/ml-proto/test/fac.wast → testsuite/fac.wast b/ml-proto/test/fac.wast → testsuite/fac.wast
diff --git a/ml-proto/test/float_exprs.wast → testsuite/float_exprs.wast b/ml-proto/test/float_exprs.wast → testsuite/float_exprs.wast
diff --git a/ml-proto/test/float_literals.wast → testsuite/float_literals.wast b/ml-proto/test/float_literals.wast → testsuite/float_literals.wast
diff --git a/ml-proto/test/float_memory.wast → testsuite/float_memory.wast b/ml-proto/test/float_memory.wast → testsuite/float_memory.wast
diff --git a/ml-proto/test/float_misc.wast → testsuite/float_misc.wast b/ml-proto/test/float_misc.wast → testsuite/float_misc.wast
diff --git a/ml-proto/test/forward.wast → testsuite/forward.wast b/ml-proto/test/forward.wast → testsuite/forward.wast
diff --git a/ml-proto/test/i32.wast → testsuite/i32.wast b/ml-proto/test/i32.wast → testsuite/i32.wast
diff --git a/ml-proto/test/i64.wast → testsuite/i64.wast b/ml-proto/test/i64.wast → testsuite/i64.wast
diff --git a/ml-proto/test/imports.wast → testsuite/imports.wast b/ml-proto/test/imports.wast → testsuite/imports.wast
diff --git a/ml-proto/test/int_exprs.wast → testsuite/int_exprs.wast b/ml-proto/test/int_exprs.wast → testsuite/int_exprs.wast
diff --git a/ml-proto/test/int_literals.wast → testsuite/int_literals.wast b/ml-proto/test/int_literals.wast → testsuite/int_literals.wast
diff --git a/ml-proto/test/labels.wast → testsuite/labels.wast b/ml-proto/test/labels.wast → testsuite/labels.wast
diff --git a/ml-proto/test/left-to-right.wast → testsuite/left-to-right.wast b/ml-proto/test/left-to-right.wast → testsuite/left-to-right.wast
diff --git a/ml-proto/test/memory.wast → testsuite/memory.wast b/ml-proto/test/memory.wast → testsuite/memory.wast
diff --git a/ml-proto/test/memory_redundancy.wast → testsuite/memory_redundancy.wast b/ml-proto/test/memory_redundancy.wast → testsuite/memory_redundancy.wast
diff --git a/ml-proto/test/memory_trap.wast → testsuite/memory_trap.wast b/ml-proto/test/memory_trap.wast → testsuite/memory_trap.wast
diff --git a/ml-proto/test/resizing.wast → testsuite/resizing.wast b/ml-proto/test/resizing.wast → testsuite/resizing.wast
diff --git a/ml-proto/test/runaway-recursion.wast → testsuite/runaway-recursion.wast b/ml-proto/test/runaway-recursion.wast → testsuite/runaway-recursion.wast
diff --git a/ml-proto/test/store_retval.wast → testsuite/store_retval.wast b/ml-proto/test/store_retval.wast → testsuite/store_retval.wast
diff --git a/ml-proto/test/switch.wast → testsuite/switch.wast b/ml-proto/test/switch.wast → testsuite/switch.wast
diff --git a/ml-proto/test/traps.wast → testsuite/traps.wast b/ml-proto/test/traps.wast → testsuite/traps.wast