Skip to content

Be more precise about which tests are disabled on macOS due to timestamp issue #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 2 commits into from
Aug 29, 2019
Merged

Be more precise about which tests are disabled on macOS due to timestamp issue #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5899816
Be more precise about which tests are disabled on macOS due to timest…
sbc100 Aug 29, 2019
ceb45a2
.
sbc100 Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -102,6 +108,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')
Expand All @@ -121,6 +128,7 @@ 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)
assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1
assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read()
Expand Down