From 5899816c532dcf1c9bb7ac210ddea0ad980b75d0 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 29 Aug 2019 12:38:53 -0700 Subject: [PATCH 1/2] Be more precise about which tests are disabled on macOS due to timestamp issue --- .circleci/config.yml | 4 +--- test.py | 9 ++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0109f79ee..22bf5e2c7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,9 +51,7 @@ jobs: name: Install cmake command: brew install cmake - run: ./test.sh - # TODO(sbc): Re-enable once the upstream emscripten fix makes it into - # a relase: https://github.com/emscripten-core/emscripten/pull/9347 - #- run: ./test.py + - run: ./test.py test-windows: executor: name: win/vs2019 diff --git a/test.py b/test.py index 80b3e34ad0..f086ad93e3 100755 --- a/test.py +++ b/test.py @@ -102,6 +102,7 @@ def run_emsdk(cmd): WINDOWS = sys.platform.startswith('win') +MACOS = sys.platform == 'darwin' upstream_emcc = os.path.join('upstream', 'emscripten', 'emcc') fastcomp_emcc = os.path.join('fastcomp', 'emscripten', 'emcc') @@ -121,7 +122,13 @@ def run_emsdk(cmd): print('test latest-releases-upstream') run_emsdk('install latest-upstream') run_emsdk('activate latest-upstream') -test_lib_building(upstream_emcc, use_asmjs_optimizer=False) + +# TODO(sbc): Re-enable this part of the test once this upstream emscripten fix +# makes it into a release: +# https://github.com/emscripten-core/emscripten/pull/9347 +if not MACOS: + test_lib_building(upstream_emcc, use_asmjs_optimizer=False) + assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1 assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read() assert 'fastcomp' not in open(os.path.expanduser('~/.emscripten')).read() From ceb45a234d7c6a51ee3ce93a11725d01b401eae3 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 29 Aug 2019 12:52:29 -0700 Subject: [PATCH 2/2] . --- test.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test.py b/test.py index f086ad93e3..179db8e693 100755 --- a/test.py +++ b/test.py @@ -68,6 +68,12 @@ def hack_emsdk(marker, replacement): def test_lib_building(emcc, use_asmjs_optimizer): + # TODO(sbc): Re-enable this part of the test once this upstream emscripten fix + # makes it into a release: + # https://github.com/emscripten-core/emscripten/pull/9347 + if MACOS: + return + def test_build(args, expected=None, unexpected=None): checked_call_with_output(emcc + ' hello_world.cpp' + args, expected=expected, @@ -123,12 +129,7 @@ def run_emsdk(cmd): run_emsdk('install latest-upstream') run_emsdk('activate latest-upstream') -# TODO(sbc): Re-enable this part of the test once this upstream emscripten fix -# makes it into a release: -# https://github.com/emscripten-core/emscripten/pull/9347 -if not MACOS: - test_lib_building(upstream_emcc, use_asmjs_optimizer=False) - +test_lib_building(upstream_emcc, use_asmjs_optimizer=False) assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1 assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read() assert 'fastcomp' not in open(os.path.expanduser('~/.emscripten')).read()