[wasm] Initial signal handler

test/cctest/wasm/wasm-run-utils.h

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 31f98f4ce63bd7b7bce221257c5e73d385f32564..49abe0c1173c4deb789fa66c8d4cfae25920126c 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"
@@ -812,17 +813,29 @@ bool WasmRunnerBase::trap_happened;
   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(RunWasmCompiledWithoutTrapIf_##name) {                              \
-    bool trap_if = FLAG_wasm_trap_if;                                      \
-    FLAG_wasm_trap_if = false;                                             \
-    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::ShouldEnableTrapHandler()) {       \
+      return;                                            \
+    }                                                    \
+    RunWasm_##name(kExecuteCompiled);                    \
+  }                                                      \
+  TEST(RunWasmCompiledWithTrapIf_##name) {               \

[ahaas, 2017/02/20 09:27:24]

Why do you change RunWasmCompiledWithoutTrapIf_ to RunWasmCompiledWithTrapIf_?

[Eric Holk, 2017/02/23 02:16:57]

Good question... I changed it back.

+    if (trap_handler::ShouldEnableTrapHandler()) {       \
+      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::ShouldEnableTrapHandler()) {       \
+      return;                                            \
+    }                                                    \
+    RunWasm_##name(kExecuteInterpreted);                 \
+  }                                                      \
   void RunWasm_##name(WasmExecutionMode execution_mode)
 
 #define WASM_EXEC_COMPILED_TEST(name)                                \