Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: test/cctest/wasm/wasm-run-utils.h

Issue 2371833007: [wasm] Initial signal handler (Closed)
Patch Set: Try to fix android compile Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: test/cctest/wasm/wasm-run-utils.h
diff --git a/test/cctest/wasm/wasm-run-utils.h b/test/cctest/wasm/wasm-run-utils.h
index 0ee7deb4fcf2615e2265c2f9aba138d74fae5c87..8c780b24251dd97c0d2fec458e21d13f70dee1f2 100644
--- a/test/cctest/wasm/wasm-run-utils.h
+++ b/test/cctest/wasm/wasm-run-utils.h
@@ -23,6 +23,7 @@
#include "src/compiler/pipeline.h"
#include "src/compiler/wasm-compiler.h"
#include "src/compiler/zone-stats.h"
+#include "src/trap-handler/trap-handler.h"
#include "src/wasm/function-body-decoder.h"
#include "src/wasm/wasm-external-refs.h"
#include "src/wasm/wasm-interpreter.h"
@@ -786,17 +787,29 @@ jmp_buf WasmRunnerBase::jump_buffer;
TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
void RunWasm_##name(WasmExecutionMode execution_mode)
-#define WASM_EXEC_TEST_WITH_TRAP(name) \
- void RunWasm_##name(WasmExecutionMode execution_mode); \
- TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \
- void RunWasm_##name(WasmExecutionMode execution_mode); \
- TEST(RunWasmCompiledWithTrapIf_##name) { \
- bool trap_if = FLAG_wasm_trap_if; \
- FLAG_wasm_trap_if = true; \
- RunWasm_##name(kExecuteCompiled); \
- FLAG_wasm_trap_if = trap_if; \
- } \
- TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
+#define WASM_EXEC_TEST_WITH_TRAP(name) \
+ void RunWasm_##name(WasmExecutionMode execution_mode); \
+ TEST(RunWasmCompiled_##name) { \
+ if (trap_handler::EnableTrapHandler()) { \
+ return; \
+ } \
+ RunWasm_##name(kExecuteCompiled); \
+ } \
+ TEST(RunWasmCompiledWithTrapIf_##name) { \
+ if (trap_handler::EnableTrapHandler()) { \
+ return; \
+ } \
+ bool trap_if = FLAG_wasm_trap_if; \
+ FLAG_wasm_trap_if = true; \
+ RunWasm_##name(kExecuteCompiled); \
+ FLAG_wasm_trap_if = trap_if; \
+ } \
+ TEST(RunWasmInterpreted_##name) { \
+ if (trap_handler::EnableTrapHandler()) { \
+ return; \
+ } \
+ RunWasm_##name(kExecuteInterpreted); \
+ } \
void RunWasm_##name(WasmExecutionMode execution_mode)
#define WASM_EXEC_COMPILED_TEST(name) \

Powered by Google App Engine
This is Rietveld 408576698