Skip to content

Commit

Permalink
Update node canary. NFC (emscripten-core#23295)
Browse files Browse the repository at this point in the history
As part of this change I verified that emscripten-core#21318 no longer effects that
latest node canary and is also fixes in the latest chromium dev channel.

Fixes: emscripten-core#21318
  • Loading branch information
sbc100 authored Jan 4, 2025
1 parent ff146f3 commit b47c44d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ commands:
description: "install canary version of node"
steps:
- install-node-version:
node_version: "24.0.0-v8-canary202411045365c9d9be"
node_version: "24.0.0-v8-canary202501036428a2737e"
canary: true
install-v8:
description: "install v8 using jsvu"
Expand Down
8 changes: 0 additions & 8 deletions test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -3694,8 +3694,6 @@ def test_pthread_main_thread_blocking_join(self):
self.btest_exit('pthread/main_thread_join.cpp', args=['-O3', '-pthread', '-sPTHREAD_POOL_SIZE', '-sPROXY_TO_PTHREAD', '-sALLOW_BLOCKING_ON_MAIN_THREAD=0'])

# Test the old GCC atomic __sync_fetch_and_op builtin operations.
@no_2gb('https://github.com/emscripten-core/emscripten/issues/21318')
@no_4gb('https://github.com/emscripten-core/emscripten/issues/21318')
@parameterized({
'': (['-g'],),
'O1': (['-O1', '-g'],),
Expand All @@ -3709,8 +3707,6 @@ def test_pthread_gcc_atomic_fetch_and_op(self, args):

# 64 bit version of the above test.
@also_with_wasm2js
@no_2gb('https://github.com/emscripten-core/emscripten/issues/21318')
@no_4gb('https://github.com/emscripten-core/emscripten/issues/21318')
def test_pthread_gcc_64bit_atomic_fetch_and_op(self):
if self.is_wasm2js():
self.skipTest('https://github.com/WebAssembly/binaryen/issues/4358')
Expand All @@ -3719,16 +3715,12 @@ def test_pthread_gcc_64bit_atomic_fetch_and_op(self):

# Test the old GCC atomic __sync_op_and_fetch builtin operations.
@also_with_wasm2js
@no_2gb('https://github.com/emscripten-core/emscripten/issues/21318')
@no_4gb('https://github.com/emscripten-core/emscripten/issues/21318')
def test_pthread_gcc_atomic_op_and_fetch(self):
self.emcc_args += ['-Wno-sync-fetch-and-nand-semantics-changed']
self.btest_exit('pthread/test_pthread_gcc_atomic_op_and_fetch.c', args=['-O3', '-pthread', '-sPTHREAD_POOL_SIZE=8'])

# 64 bit version of the above test.
@also_with_wasm2js
@no_2gb('https://github.com/emscripten-core/emscripten/issues/21318')
@no_4gb('https://github.com/emscripten-core/emscripten/issues/21318')
def test_pthread_gcc_64bit_atomic_op_and_fetch(self):
if self.is_wasm2js():
self.skipTest('https://github.com/WebAssembly/binaryen/issues/4358')
Expand Down

0 comments on commit b47c44d

Please sign in to comment.