aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2014-02-01 10:29:52 +0200
committerJukka Jylänki <jujjyl@gmail.com>2014-02-01 10:30:45 +0200
commitf5c957b2893744f061adbcf2a911cb693025a613 (patch)
tree1186578daebc1bbc7f9f28e364f035713562e890
parent53af8ab2ebc91488d53e27dd69f7c8b8901cbda5 (diff)
Only skip emscripten_log test on SpiderMonkey in asm.js modes, since the test fails due to asm.js execution in SpiderMonkey not being able to retrieve callstacks. Add link to relevant bugzilla entry. Closes #1970.
-rw-r--r--tests/test_core.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_core.py b/tests/test_core.py
index 43b675f5..32b3f143 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6166,7 +6166,9 @@ def process(filename):
self.build(src, dirname, os.path.join(dirname, 'src.cpp'), post_build=(None, post))
def test_emscripten_log(self):
- self.banned_js_engines = [SPIDERMONKEY_ENGINE] # XXX, emscripten_log is broken in spidermonkey currently, issue #1970
+ if Settings.ASM_JS:
+ # XXX Does not work in SpiderMonkey since callstacks cannot be captured when running in asm.js, see https://bugzilla.mozilla.org/show_bug.cgi?id=947996
+ self.banned_js_engines = [SPIDERMONKEY_ENGINE]
if self.emcc_args is None: return self.skip('This test needs libc.')
if '-g' not in Building.COMPILER_TEST_OPTS: Building.COMPILER_TEST_OPTS.append('-g')
self.do_run('#define RUN_FROM_JS_SHELL\n' + open(path_from_root('tests', 'emscripten_log', 'emscripten_log.cpp')).read(), "Success!")