Remove testing of s2wasm via the wasm waterfall scripts (#1604)

The wasm waterfall is moving away from testing with s2wasm
and s2wasm hopefully going to be removed soon.

Author: sbc100

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 ignore = E111,E114,E501,E121
-exclude = ./test/emscripten,./test/waterfall,./test/spec,./test/wasm-install
+exclude = ./test/emscripten,./test/spec,./test/wasm-install

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "test/spec"]
 	path = test/spec
 	url = https://github.com/WebAssembly/testsuite.git
-[submodule "test/waterfall"]
-	path = test/waterfall
-	url = https://github.com/WebAssembly/waterfall.git
 [submodule "test/emscripten"]
 	path = test/emscripten
 	url = https://github.com/kripken/emscripten.git

.travis.yml

@@ -30,8 +30,6 @@ jobs:
         - npm install jsvu -g
         - export PATH="${HOME}/.jsvu:${PATH}"
         - jsvu --os=linux64 --engines=spidermonkey
-      before_script:
-        - ./check.py --test-waterfall --only-prepare
       script:
         - set -o errexit
         - flake8
@@ -40,7 +38,7 @@ jobs:
         - cmake ${TRAVIS_BUILD_DIR} -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" -DCMAKE_INSTALL_PREFIX=install
         - make -j2 install
         - cd ${TRAVIS_BUILD_DIR}
-        - ./check.py --test-waterfall --binaryen-bin=${BUILD_SUBDIR}/install/bin
+        - ./check.py --binaryen-bin=${BUILD_SUBDIR}/install/bin
 
     - <<: *test-ubuntu
       env: |
@@ -96,12 +94,10 @@ jobs:
       install:
         - alpine apk update
         - alpine apk add build-base cmake git python2
-      before_script:
-        - alpine ./check.py --test-waterfall --only-prepare
       script:
         - alpine cmake .
         - alpine make -j2
-        - alpine ./check.py --test-waterfall
+        - alpine ./check.py
 
     # Build statically linked release binaries with gcc 6.3 on Alpine Linux
     # (inside chroot). If building a tagged commit, then deploy release tarball

README.md

@@ -225,7 +225,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/waterfall`, in git submodules. Running `./check.py` should update those.
+ * We have tests from upstream in `tests/spec`, in git submodules. Running `./check.py` should update those.
 
 ## Design Principles
 

check.py

@@ -21,8 +21,8 @@
 
 from scripts.test.support import run_command, split_wast, node_test_glue, node_has_webassembly
 from scripts.test.shared import (
-    BIN_DIR, EMCC, MOZJS, NATIVECC, NATIVEXX, NODEJS, S2WASM_EXE,
-    WASM_AS, WASM_CTOR_EVAL, WASM_OPT, WASM_SHELL, WASM_MERGE, WASM_SHELL_EXE, WASM_METADCE,
+    BIN_DIR, EMCC, MOZJS, NATIVECC, NATIVEXX, NODEJS,
+    WASM_AS, WASM_CTOR_EVAL, WASM_OPT, WASM_SHELL, WASM_MERGE, WASM_METADCE,
     WASM_DIS, WASM_REDUCE, binary_format_check, delete_from_orbit, fail, fail_with_error,
     fail_if_not_identical, fail_if_not_contained, has_vanilla_emcc,
     has_vanilla_llvm, minify_check, num_failures, options, tests,
@@ -461,50 +461,6 @@ def run_validator_tests():
   run_command(cmd)
 
 
-def run_torture_tests():
-  print '\n[ checking torture testcases... ]\n'
-
-  # torture tests are parallel anyhow, don't create multiple threads in each child
-  old_cores = os.environ.get('BINARYEN_CORES')
-  try:
-    os.environ['BINARYEN_CORES'] = '1'
-
-    unexpected_result_count = 0
-
-    import test.waterfall.src.link_assembly_files as link_assembly_files
-    s2wasm_torture_out = os.path.abspath(os.path.join(options.binaryen_test, 's2wasm-torture-out'))
-    if os.path.isdir(s2wasm_torture_out):
-      shutil.rmtree(s2wasm_torture_out)
-    os.mkdir(s2wasm_torture_out)
-    unexpected_result_count += link_assembly_files.run(
-        linker=os.path.abspath(S2WASM_EXE),
-        files=os.path.abspath(os.path.join(options.binaryen_test, 'torture-s', '*.s')),
-        fails=[os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_gcc_test_failures.txt'))],
-        attributes=['O2'],
-        out=s2wasm_torture_out,
-        args=None)
-    assert os.path.isdir(s2wasm_torture_out), 'Expected output directory %s' % s2wasm_torture_out
-
-    import test.waterfall.src.execute_files as execute_files
-    unexpected_result_count += execute_files.run(
-        runner=os.path.abspath(WASM_SHELL_EXE),
-        files=os.path.abspath(os.path.join(s2wasm_torture_out, '*.wast')),
-        fails=[os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_binaryen_shell_test_failures.txt'))],
-        attributes=['O2'],
-        out='',
-        wasmjs='')
-
-    shutil.rmtree(s2wasm_torture_out)
-    if unexpected_result_count:
-      fail('%s failures' % unexpected_result_count, '0 failures')
-
-  finally:
-    if old_cores:
-      os.environ['BINARYEN_CORES'] = old_cores
-    else:
-      del os.environ['BINARYEN_CORES']
-
-
 def run_vanilla_tests():
   print '\n[ checking emcc WASM_BACKEND testcases...]\n'
 
@@ -681,8 +637,6 @@ def main():
   lld.test_wasm_emscripten_finalize()
   wasm2asm.test_wasm2asm()
   run_validator_tests()
-  if options.torture and options.test_waterfall:
-    run_torture_tests()
   if has_vanilla_emcc and has_vanilla_llvm and 0:
     run_vanilla_tests()
   print '\n[ checking example testcases... ]\n'

scripts/test/shared.py

@@ -19,7 +19,6 @@
 import shutil
 import subprocess
 import sys
-import urllib2
 
 
 def parse_args(args):
@@ -32,17 +31,6 @@ def parse_args(args):
   parser.add_argument(
       '--no-torture', dest='torture', action='store_false',
       help='Disables running the torture testcases.')
-  parser.add_argument(
-      '--only-prepare', dest='only_prepare', action='store_true', default=False,
-      help='If enabled, only fetches the waterfall build. Default: false.')
-  parser.add_argument(
-      '--test-waterfall', dest='test_waterfall', action='store_true',
-      default=False,
-      help=('If enabled, fetches and tests the LLVM waterfall builds.'
-            ' Default: false.'))
-  parser.add_argument(
-      '--no-test-waterfall', dest='test_waterfall', action='store_false',
-      help='Disables downloading and testing of the LLVM waterfall builds.')
   parser.add_argument(
       '--abort-on-first-failure', dest='abort_on_first_failure',
       action='store_true', default=True,
@@ -188,9 +176,6 @@ def is_exe(fpath):
 WASM_EMSCRIPTEN_FINALIZE = [os.path.join(options.binaryen_bin,
                                          'wasm-emscripten-finalize')]
 
-S2WASM_EXE = S2WASM[0]
-WASM_SHELL_EXE = WASM_SHELL[0]
-
 
 def wrap_with_valgrind(cmd):
   # Exit code 97 is arbitrary, used to easily detect when an error occurs that
@@ -223,59 +208,8 @@ def has_shell_timeout():
   return get_platform() != 'windows' and os.system('timeout 1s pwd') == 0
 
 
-def fetch_waterfall():
-  rev = open(os.path.join(options.binaryen_test, 'revision')).read().strip()
-  buildername = get_platform()
-  local_rev_path = os.path.join(WATERFALL_BUILD_DIR, 'local-revision')
-  if os.path.exists(local_rev_path):
-    with open(local_rev_path) as f:
-      local_rev = f.read().strip()
-    if local_rev == rev:
-      return
-  # fetch it
-  basename = 'wasm-binaries-' + rev + '.tbz2'
-  url = '/'.join(['https://storage.googleapis.com/wasm-llvm/builds',
-                  buildername, rev, basename])
-  print '(downloading waterfall %s: %s)' % (rev, url)
-  downloaded = urllib2.urlopen(url).read().strip()
-  fullname = os.path.join(options.binaryen_test, basename)
-  open(fullname, 'wb').write(downloaded)
-  print '(unpacking)'
-  if os.path.exists(WATERFALL_BUILD_DIR):
-    shutil.rmtree(WATERFALL_BUILD_DIR)
-  os.mkdir(WATERFALL_BUILD_DIR)
-  subprocess.check_call(['tar', '-xf', os.path.abspath(fullname)],
-                        cwd=WATERFALL_BUILD_DIR)
-  print '(noting local revision)'
-  with open(local_rev_path, 'w') as o:
-    o.write(rev + '\n')
-
-
 has_vanilla_llvm = False
 
-
-def setup_waterfall():
-  # if we can use the waterfall llvm, do so
-  global has_vanilla_llvm
-  CLANG = os.path.join(BIN_DIR, 'clang')
-  print 'trying waterfall clang at', CLANG
-  try:
-    subprocess.check_call([CLANG, '-v'])
-    has_vanilla_llvm = True
-    print '...success'
-  except (OSError, subprocess.CalledProcessError) as e:
-    warn('could not run vanilla LLVM from waterfall: ' + str(e) +
-         ', looked for clang at ' + CLANG)
-
-
-if options.test_waterfall:
-  fetch_waterfall()
-  setup_waterfall()
-
-if options.only_prepare:
-  print 'waterfall is fetched and setup, exiting since --only-prepare'
-  sys.exit(0)
-
 # external tools
 
 try: