summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--README.md2
-rwxr-xr-xcheck.py2
m---------test/experimental0
m---------test/waterfall0
5 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 0d0d49215..cb63d1944 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "test/spec"]
path = test/spec
url = https://github.com/WebAssembly/testsuite.git
-[submodule "test/experimental"]
- path = test/experimental
- url = https://github.com/WebAssembly/experimental.git
+[submodule "test/waterfall"]
+ path = test/waterfall
+ url = https://github.com/WebAssembly/waterfall.git
diff --git a/README.md b/README.md
index 8aca0c6c0..d27a05ca5 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ The `check.py` script supports some options:
* If an interpreter is provided, we run the output through it, checking for parse errors.
* If tests are provided, we run exactly those. If none are provided, we run them all.
* Some tests require `emcc` or `nodejs` in the path. They will not run if the tool cannot be found, and you'll see a warning.
- * We have tests from upstream in `tests/spec` and `tests/experimental`, in git submodules. Running `./update.py` should update those.
+ * We have tests from upstream in `tests/spec` and `tests/waterfall`, in git submodules. Running `./update.py` should update those.
(`src/emscripten-optimizer` is synced with `tools/optimizer/` in the main emscripten repo, for convenience)
diff --git a/check.py b/check.py
index cacdc9129..0667dca56 100755
--- a/check.py
+++ b/check.py
@@ -258,7 +258,7 @@ for dot_s_dir in ['dot_s', 'llvm_autogenerated']:
print '\n[ checking torture testcases... ]\n'
-import test.experimental.buildbot.link_assembly_files as link_assembly_files
+import test.waterfall.src.link_assembly_files as link_assembly_files
s2wasm_torture_out = os.path.abspath(os.path.join('test', 's2wasm-torture-out'))
if os.path.isdir(s2wasm_torture_out):
shutil.rmtree(s2wasm_torture_out)
diff --git a/test/experimental b/test/experimental
deleted file mode 160000
-Subproject acebc2764b7b80e2b447dfa0e2349e97c24518f
diff --git a/test/waterfall b/test/waterfall
new file mode 160000
+Subproject 19d7e9537196854f6178129a247a004e1a7b407