wip [ci skip]
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1d56b9..bf686ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -167,7 +167,7 @@
# --no-sandbox becasue we are running as root and chrome requires
# this flag for now: https://crbug.com/638180
CHROME_FLAGS_BASE="--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader"
- CHROME_FLAGS_WASM="--enable-features=WebAssembly --enable-features=SharedArrayBuffer --disable-features=WebAssemblyTrapHandler --js-flags=\"--experimental-wasm-threads --harmony-sharedarraybuffer --no-wasm-disable-structured-cloning\""
+ CHROME_FLAGS_WASM="--enable-features=WebAssembly --enable-features=SharedArrayBuffer --disable-features=WebAssemblyTrapHandler --enable-experimental-web-platform-features --js-flags=\"--experimental-wasm-threads --harmony-sharedarraybuffer --no-wasm-disable-structured-cloning\""
export EMTEST_BROWSER="xvfb-run -a -e /dev/stdout /usr/bin/google-chrome-stable $CHROME_FLAGS_BASE $CHROME_FLAGS_WASM"
export EMTEST_LACKS_GRAPHICS_HARDWARE=1
export EMCC_CORES=4
diff --git a/src/preamble.js b/src/preamble.js
index 0c7cd5f..bb58c7f 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -1,4 +1,3 @@
-if (typeof log === 'function') log('premalbe');
// === Preamble library stuff ===
// Documentation for the public APIs defined in this file must be updated in:
diff --git a/tests/test_browser.py b/tests/test_browser.py
index b3f1e59..53baa7a 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -4716,28 +4716,14 @@
print(str(args + wasm + modularize))
self.btest('minimal_hello.c', '0', args=args + wasm + modularize)
+ @no_firefox('need to enable es6 modules there somehow')
def _test_es6(self, args):
args = args + ['-s', 'EXPORT_ES6', '-s', 'MODULARIZE', '-s', 'MODULARIZE_INSTANCE', '-s', 'ASSERTIONS', '-o', 'test.mjs']
print(args)
create_test_file('src.c', self.with_report_result(open(path_from_root('tests', 'browser_test_hello_world.c')).read()))
self.compile_btest(['src.c'] + args)
create_test_file('test.html', '''
- <script>
- var logs = 0;
- function log(e) {
- var xhr = new XMLHttpRequest();
- xhr.open('GET', encodeURI('http://localhost:8888?stdout=' + e + ' : ' + new Error().stack + ' : ' + logs++));
- xhr.send();
- }
- log('startup');
- window.onerror = function(e) {
- log(e);
- };
- </script>
<script type="module" src="test.mjs"></script>
- <script>
- log('after');
- </script>
''')
self.run_browser('test.html', None, '/report_result?0')
@@ -4754,6 +4740,4 @@
def test_es6_threads(self):
# TODO: use PROXY_TO_PTHREAD and/or '-s', 'PTHREAD_POOL_SIZE=1' once https://bugs.chromium.org/p/chromium/issues/detail?id=680046 is fixed
# firefox also errors, "SyntaxError: dynamic module import is not implemented"
- self._test_es6(['-s', 'USE_PTHREADS'])
-
-
+ self._test_es6(['-s', 'USE_PTHREADS', '-s', 'PROXY_TO_PTHREAD'])
