diff options
| -rwxr-xr-x | check.py | 6 | ||||
| -rw-r--r-- | src/shell-interface.h | 2 | ||||
| -rw-r--r-- | test/passes/fuzz-exec_O.txt | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -197,7 +197,11 @@ def run_spec_tests(): def run_spec_test(wast): cmd = shared.WASM_SHELL + [wast] - return support.run_command(cmd, stderr=subprocess.PIPE) + output = support.run_command(cmd, stderr=subprocess.PIPE) + # filter out binaryen interpreter logging that the spec suite + # doesn't expect + filtered = [line for line in output.splitlines() if not line.startswith('[trap')] + return '\n'.join(filtered) + '\n' def run_opt_test(wast): # check optimization validation diff --git a/src/shell-interface.h b/src/shell-interface.h index 94ecd61c3..a5293ac76 100644 --- a/src/shell-interface.h +++ b/src/shell-interface.h @@ -218,7 +218,7 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { } void trap(const char* why) override { - std::cerr << "[trap " << why << "]\n"; + std::cout << "[trap " << why << "]\n"; throw TrapException(); } }; diff --git a/test/passes/fuzz-exec_O.txt b/test/passes/fuzz-exec_O.txt index 095d301d1..841507f60 100644 --- a/test/passes/fuzz-exec_O.txt +++ b/test/passes/fuzz-exec_O.txt @@ -1,5 +1,7 @@ [fuzz-exec] calling func_0 +[trap final > memory: 18446744073709551615 > 65514] [fuzz-exec] calling func_1 +[trap final > memory: 18446744073709551615 > 65514] (module (type $none_=>_i32 (func (result i32))) (type $none_=>_i64 (func (result i64))) @@ -23,6 +25,8 @@ ) ) [fuzz-exec] calling func_0 +[trap final > memory: 18446744073709551615 > 65514] [fuzz-exec] calling func_1 +[trap final > memory: 18446744073709551615 > 65514] [fuzz-exec] comparing func_0 [fuzz-exec] comparing func_1 |