diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 10:54:10 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 11:05:05 -0700 |
| commit | 0ff7f8dcd655e84eb7c750cff927b11231b61589 (patch) | |
| tree | 0e5835cec2acaa4ce0bf7c760c36158350dd55bc /tests | |
| parent | e9624929302ad7f10d38a8de21dd0d7f5aa1f675 (diff) | |
fix inline js in x86 target, enable testing sans validation for inline js in asm.js, fix unistd tests that use inline js to not validate, and make js optimizer more tolerant of inline js in asm code; fixes #1597
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/runner.py | 2 | ||||
| -rw-r--r-- | tests/test_core.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/runner.py b/tests/runner.py index f0e61c4e..8747c340 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -254,7 +254,7 @@ process(sys.argv[1]) os.chdir(cwd) out = open(stdout, 'r').read() err = open(stderr, 'r').read() - if engine == SPIDERMONKEY_ENGINE and Settings.ASM_JS: + if engine == SPIDERMONKEY_ENGINE and Settings.ASM_JS == 1: err = self.validate_asmjs(err) if output_nicerizer: ret = output_nicerizer(out, err) diff --git a/tests/test_core.py b/tests/test_core.py index 2238859b..3568efee 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -3742,7 +3742,7 @@ def process(filename): self.do_run(open(path_from_root('tests', 'emscripten_get_now.cpp')).read(), 'Timer resolution is good.') def test_inlinejs(self): - if Settings.ASM_JS: return self.skip('asm does not support random code, TODO: something that works in asm') + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = r''' #include <stdio.h> @@ -3762,7 +3762,7 @@ def process(filename): self.do_run(src, 'Inline JS is very cool\n3.64\n') def test_inlinejs2(self): - if Settings.ASM_JS: return self.skip('asm does not support random code, TODO: something that works in asm') + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = r''' #include <stdio.h> @@ -7613,11 +7613,13 @@ def process(filename): Settings.INCLUDE_FULL_LIBRARY = 0 def test_unistd_access(self): + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = open(path_from_root('tests', 'unistd', 'access.c'), 'r').read() expected = open(path_from_root('tests', 'unistd', 'access.out'), 'r').read() self.do_run(src, expected) def test_unistd_curdir(self): + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = open(path_from_root('tests', 'unistd', 'curdir.c'), 'r').read() expected = open(path_from_root('tests', 'unistd', 'curdir.out'), 'r').read() self.do_run(src, expected) @@ -7647,6 +7649,7 @@ def process(filename): self.do_run(src, expected) def test_unistd_truncate(self): + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = open(path_from_root('tests', 'unistd', 'truncate.c'), 'r').read() expected = open(path_from_root('tests', 'unistd', 'truncate.out'), 'r').read() self.do_run(src, expected) @@ -7675,6 +7678,7 @@ def process(filename): self.do_run(src, 'success', force_c=True) def test_unistd_links(self): + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = open(path_from_root('tests', 'unistd', 'links.c'), 'r').read() expected = open(path_from_root('tests', 'unistd', 'links.out'), 'r').read() self.do_run(src, expected) @@ -7685,6 +7689,7 @@ def process(filename): self.do_run(src, expected) def test_unistd_io(self): + if Settings.ASM_JS: Settings.ASM_JS = 2 # skip validation, asm does not support random code src = open(path_from_root('tests', 'unistd', 'io.c'), 'r').read() expected = open(path_from_root('tests', 'unistd', 'io.out'), 'r').read() self.do_run(src, expected) |