Skip to content

Commit 0d8be82

Browse files
authored
Enabled test_pthread_dylink_tls under STACK_OVERFLOW_CHECK=2 (#26890)
The actual fix for this was combination of #26878 and WebAssembly/binaryen#8679 Fixes: #24964 Please enter the commit message for your changes. Lines starting
1 parent ca13dbc commit 0d8be82

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ jobs:
710710
core2g.test_externref
711711
corez.test_dylink_iostream
712712
core2ss.test_pthread_dylink
713+
core2ss.test_pthread_dylink_tls
713714
core2ss.test_pthread_thread_local_storage
714715
core2ss.test_wasm_worker_futex_wait
715716
core2s.test_dylink_syslibs_missing_assertions

test/test_core.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9364,9 +9364,6 @@ def test_pthread_dlsym(self):
93649364
@needs_dylink
93659365
@requires_pthreads
93669366
def test_pthread_dylink_tls(self):
9367-
if self.get_setting('STACK_OVERFLOW_CHECK') == 2:
9368-
self.skipTest('https://github.com/emscripten-core/emscripten/issues/24964: fails with stack overflow (Attempt to set SP to 0x000114d0, with stack limits [0x00000000 - 0x00000000])')
9369-
93709367
self.cflags += ['-Wno-experimental', '-pthread']
93719368
main = test_file('core/pthread/test_pthread_dylink_tls.c')
93729369
self.dylink_testf(main, main_cflags=['-sPTHREAD_POOL_SIZE=1'])

0 commit comments

Comments
 (0)