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.

1 files changed, 0 insertions, 66 deletions

diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index 6fd18c814..a0bce3dd5 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -19,7 +19,6 @@ import os
 import shutil
 import subprocess
 import sys
-import urllib2
 
 
 def parse_args(args):
@@ -33,17 +32,6 @@ def parse_args(args):
       '--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,
       help=('Specifies whether to halt test suite execution on first test error.'
@@ -188,9 +176,6 @@ WASM_METADCE = [os.path.join(options.binaryen_bin, 'wasm-metadce')]
 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: