diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-09-16 16:48:20 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2016-09-16 16:48:20 -0700 |
| commit | 8ff678788ada565d15273ca6ca872946f14584d6 (patch) | |
| tree | 39e0b98968a4491ce289586073c76b055e2e67fd /src | |
| parent | 5126ebef968cd27ae3cb8f61357c95626c25ad25 (diff) | |
| download | binaryen-8ff678788ada565d15273ca6ca872946f14584d6.tar.gz binaryen-8ff678788ada565d15273ca6ca872946f14584d6.tar.bz2 binaryen-8ff678788ada565d15273ca6ca872946f14584d6.zip | |
support assert_malformed in shell test runner
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared-constants.h | 3 | ||||
| -rw-r--r-- | src/tools/wasm-shell.cpp | 7 | ||||
| -rw-r--r-- | src/wasm.cpp | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/shared-constants.h b/src/shared-constants.h index f0148cb67..e37879088 100644 --- a/src/shared-constants.h +++ b/src/shared-constants.h @@ -47,9 +47,6 @@ extern Name GROW_WASM_MEMORY, BR, ANYFUNC, FAKE_RETURN, - ASSERT_RETURN, - ASSERT_TRAP, - ASSERT_INVALID, SPECTEST, PRINT, INVOKE, diff --git a/src/tools/wasm-shell.cpp b/src/tools/wasm-shell.cpp index a95ced87f..ddb2f8a85 100644 --- a/src/tools/wasm-shell.cpp +++ b/src/tools/wasm-shell.cpp @@ -34,6 +34,11 @@ using namespace cashew; using namespace wasm; +Name ASSERT_RETURN("assert_return"), + ASSERT_TRAP("assert_trap"), + ASSERT_INVALID("assert_invalid"), + ASSERT_MALFORMED("assert_malformed"); + // // An invocation into a module // @@ -109,7 +114,7 @@ static void run_asserts(size_t* i, bool* checked, Module* wasm, Colors::green(std::cerr); std::cerr << " [line: " << curr.line << "]\n"; Colors::normal(std::cerr); - if (id == ASSERT_INVALID) { + if (id == ASSERT_INVALID || id == ASSERT_MALFORMED) { // a module invalidity test Module wasm; bool invalid = false; diff --git a/src/wasm.cpp b/src/wasm.cpp index f6486eb50..144cabd16 100644 --- a/src/wasm.cpp +++ b/src/wasm.cpp @@ -72,9 +72,6 @@ Name GROW_WASM_MEMORY("__growWasmMemory"), BR("br"), ANYFUNC("anyfunc"), FAKE_RETURN("fake_return_waka123"), - ASSERT_RETURN("assert_return"), - ASSERT_TRAP("assert_trap"), - ASSERT_INVALID("assert_invalid"), SPECTEST("spectest"), PRINT("print"), INVOKE("invoke"), |