diff options
| -rwxr-xr-x | auto_update_tests.py | 4 | ||||
| -rwxr-xr-x | check.py | 6 | ||||
| -rw-r--r-- | scripts/test/shared.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/auto_update_tests.py b/auto_update_tests.py index c6d376fa0..76c7b4cf9 100755 --- a/auto_update_tests.py +++ b/auto_update_tests.py @@ -4,7 +4,7 @@ import os, sys, subprocess, difflib from scripts.test.support import run_command, split_wast from scripts.test.shared import ( - ASM2WASM, S2WASM, WASM_SHELL, WASM_OPT, WASM_AS, WASM_DIS) + ASM2WASM, S2WASM, WASM_SHELL, WASM_OPT, WASM_AS, WASM_DIS, WASM_CTOR_EVAL) print '[ processing and updating testcases... ]\n' @@ -242,7 +242,7 @@ for t in os.listdir(os.path.join('test', 'ctor-eval')): print '..', t t = os.path.join('test', 'ctor-eval', t) ctors = open(t + '.ctors').read().strip() - cmd = [os.path.join('bin', 'wasm-ctor-eval'), t, '-o', 'a.wast', '-S', '--ctors', ctors] + cmd = WASM_CTOR_EVAL + [t, '-o', 'a.wast', '-S', '--ctors', ctors] stdout = run_command(cmd) actual = open('a.wast').read() out = t + '.out' @@ -23,8 +23,8 @@ import sys from scripts.test.support import run_command, split_wast from scripts.test.shared import ( ASM2WASM, BIN_DIR, EMCC, MOZJS, NATIVECC, NATIVEXX, NODEJS, S2WASM_EXE, - WASM_AS, WASM_OPT, WASM_SHELL, WASM_MERGE, WASM_SHELL_EXE, WASM_DIS, - binary_format_check, delete_from_orbit, fail, fail_with_error, + WASM_AS, WASM_CTOR_EVAL, WASM_OPT, WASM_SHELL, WASM_MERGE, WASM_SHELL_EXE, + WASM_DIS, 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, requested, warnings @@ -304,7 +304,7 @@ for t in os.listdir(os.path.join('test', 'ctor-eval')): print '..', t t = os.path.join('test', 'ctor-eval', t) ctors = open(t + '.ctors').read().strip() - cmd = [os.path.join('bin', 'wasm-ctor-eval'), t, '-o', 'a.wast', '-S', '--ctors', ctors] + cmd = WASM_CTOR_EVAL + [t, '-o', 'a.wast', '-S', '--ctors', ctors] stdout = run_command(cmd) actual = open('a.wast').read() out = t + '.out' diff --git a/scripts/test/shared.py b/scripts/test/shared.py index f6f06722c..b71545965 100644 --- a/scripts/test/shared.py +++ b/scripts/test/shared.py @@ -155,6 +155,7 @@ WASM_OPT = [os.path.join(options.binaryen_bin, 'wasm-opt')] WASM_AS = [os.path.join(options.binaryen_bin, 'wasm-as')] WASM_DIS = [os.path.join(options.binaryen_bin, 'wasm-dis')] ASM2WASM = [os.path.join(options.binaryen_bin, 'asm2wasm')] +WASM_CTOR_EVAL = [os.path.join(options.binaryen_bin, 'wasm-ctor-eval')] WASM_SHELL = [os.path.join(options.binaryen_bin, 'wasm-shell')] WASM_MERGE = [os.path.join(options.binaryen_bin, 'wasm-merge')] S2WASM = [os.path.join(options.binaryen_bin, 's2wasm')] |