summaryrefslogtreecommitdiff
path: root/check.py
diff options
context:
space:
mode:
Diffstat (limited to 'check.py')
-rwxr-xr-xcheck.py34
1 files changed, 3 insertions, 31 deletions
diff --git a/check.py b/check.py
index 864642b23..a7768ad6a 100755
--- a/check.py
+++ b/check.py
@@ -22,9 +22,9 @@ import unittest
from scripts.test.support import run_command, split_wast, node_test_glue, node_has_webassembly
from scripts.test.shared import (
- BIN_DIR, MOZJS, NATIVECC, NATIVEXX, NODEJS, BINARYEN_JS,
- 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,
+ BIN_DIR, MOZJS, NATIVECC, NATIVEXX, NODEJS, BINARYEN_JS, WASM_AS,
+ WASM_CTOR_EVAL, WASM_OPT, WASM_SHELL, 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, options, tests, requested, warnings,
has_shell_timeout, fail_if_not_identical_to_file
@@ -203,33 +203,6 @@ def run_wasm_dis_tests():
with_pass_debug(check)
-def run_wasm_merge_tests():
- print '\n[ checking wasm-merge... ]\n'
-
- test_dir = os.path.join(options.binaryen_test, 'merge')
- for t in os.listdir(test_dir):
- if t.endswith(('.wast', '.wasm')):
- print '..', t
- t = os.path.join(test_dir, t)
- u = t + '.toMerge'
- for finalize in [0, 1]:
- for opt in [0, 1]:
- cmd = WASM_MERGE + [t, u, '-o', 'a.wast', '-S', '--verbose']
- if finalize:
- cmd += ['--finalize-memory-base=1024', '--finalize-table-base=8']
- if opt:
- cmd += ['-O']
- stdout = run_command(cmd)
- actual = open('a.wast').read()
- out = t + '.combined'
- if finalize:
- out += '.finalized'
- if opt:
- out += '.opt'
- fail_if_not_identical_to_file(actual, out)
- fail_if_not_identical_to_file(stdout, out + '.stdout')
-
-
def run_crash_tests():
print "\n[ checking we don't crash on tricky inputs... ]\n"
@@ -614,7 +587,6 @@ def main():
asm2wasm.test_asm2wasm()
asm2wasm.test_asm2wasm_binary()
run_wasm_dis_tests()
- run_wasm_merge_tests()
run_crash_tests()
run_dylink_tests()
run_ctor_eval_tests()