From 56023409863e3823d3732a07a8a04c6b81b044ce Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 19 Nov 2018 15:37:47 -0800
Subject: [PATCH] Fix tests

---
 tests/runner.py    | 2 +-
 tests/test_core.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/runner.py b/tests/runner.py
index ba4b2e60a1cd..7096d857f582 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -253,7 +253,7 @@ def is_emterpreter(self):
     return self.get_setting('EMTERPRETIFY')
 
   def is_wasm(self):
-    return not self.get_setting('WASM') or self.is_wasm_backend()
+    return self.is_wasm_backend() or self.get_setting('WASM') != 0
 
   def is_wasm_backend(self):
     return self.get_setting('WASM_BACKEND')
diff --git a/tests/test_core.py b/tests/test_core.py
index 4851d649ab1a..8e9c06895103 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -7903,7 +7903,7 @@ def test_binaryen_trap_mode(self):
     if not self.is_wasm():
       self.skipTest('wasm test')
     TRAP_OUTPUTS = ('trap', 'RuntimeError')
-    default = self.get_setting('BINARYEN_TRAP_MODE')
+    default = 'allow'
     print('default is', default)
     for mode in ['js', 'clamp', 'allow', '']:
       if mode == 'js' and self.is_wasm_backend():