diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-02-09 14:50:42 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-09 14:50:42 -0800 |
commit | ab1ea19af2e0528a0d69165fbddde771da65b899 (patch) | |
tree | 65e682d94e838ed0a5f819fc6a64418f9ddf470d | |
parent | 72c0b9e5c7682413398e31688999d3dc0e5384d8 (diff) |
deprecate --split option and disable browser tests using it in fastcomp
-rwxr-xr-x | emcc | 4 | ||||
-rw-r--r-- | tests/test_browser.py | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -391,6 +391,9 @@ Options that are modified or new in %s include: The main file resides in the base directory and has the suffix ".js". + Note: this option is deprecated (modern JS debuggers + should work ok even on large files) + --bind Compiles the source code using the "embind" bindings approach, which connects C/C++ and JS. @@ -1206,6 +1209,7 @@ try: assert shared.Settings.PGO == 0, 'pgo not supported in fastcomp' assert shared.Settings.TARGET_LE32 == 1, 'fastcomp requires le32' assert shared.Settings.USE_TYPED_ARRAYS == 2, 'fastcomp assumes ta2' + assert not split_js_file, '--split-js is deprecated and not supported in fastcomp' assert not bind, 'embind not supported in fastcomp yet' if jcache: logging.warning('jcache is not supported in fastcomp (you should not need it anyhow), disabling') diff --git a/tests/test_browser.py b/tests/test_browser.py index 527b4d17..2c85f5ca 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -143,6 +143,8 @@ If manually bisecting: os.chdir(cwd) def test_split(self): + if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('no --split in fastcomp, deprecated') + # test HTML generation. self.reftest(path_from_root('tests', 'htmltest.png')) output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '--split', '100', '--pre-js', 'reftest.js']).communicate() @@ -235,6 +237,8 @@ If manually bisecting: self.run_browser('something.html', 'You should see "hello, world!" and a colored cube.', '/report_result?0') def test_split_in_source_filenames(self): + if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('no --split in fastcomp, deprecated') + self.reftest(path_from_root('tests', 'htmltest.png')) output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '-g', '--split', '100', '--pre-js', 'reftest.js']).communicate() assert os.path.exists(os.path.join(self.get_dir(), 'something.js')), 'must be main js file' |