Skip to content

Conversation

google-yfyang
Copy link
Collaborator

@google-yfyang google-yfyang commented Aug 20, 2025

No description provided.

@sbc100
Copy link
Collaborator

sbc100 commented Aug 24, 2025

Can you update the PR description to remove emscripten_platform_errors reference

@sbc100
Copy link
Collaborator

sbc100 commented Aug 25, 2025

Can you also update the "Owner died" message. See #25008

@juj
Copy link
Collaborator

juj commented Aug 26, 2025

There's also this difference:

======================================================================
FAIL: test_pthread_mutex_robust (test_core.llvmlibc.test_pthread_mutex_robust)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/mnt/ssd1000/emscripten_buildbot/worker_root/x10dax-linux-mint22/emscripten_x10dax/build/emscripten/main/test/common.py", line 376, in decorated
    f(self, *args, **kwargs)
  File "/mnt/ssd1000/emscripten_buildbot/worker_root/x10dax-linux-mint22/emscripten_x10dax/build/emscripten/main/test/test_core.py", line 2752, in test_pthread_mutex_robust
    self.do_run_in_out_file_test('pthread/test_pthread_mutex_robust.c')
  File "/mnt/ssd1000/emscripten_buildbot/worker_root/x10dax-linux-mint22/emscripten_x10dax/build/emscripten/main/test/common.py", line 1971, in do_run_in_out_file_test
    output = self._build_and_run(srcfile, expected, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/mnt/ssd1000/emscripten_buildbot/worker_root/x10dax-linux-mint22/emscripten_x10dax/build/emscripten/main/test/common.py", line 2020, in _build_and_run
    self.assertContained(o, js_output, regex=regex)
  File "/mnt/ssd1000/emscripten_buildbot/worker_root/x10dax-linux-mint22/emscripten_x10dax/build/emscripten/main/test/common.py", line 1678, in assertContained
    self.fail("Expected to find '%s' in '%s', diff:\n\n%s\n%s" % (
AssertionError: Expected to find '[original owner] Setting lock...
[original owner] Locked. Now exiting without unlocking.
[main] Attempting to lock the robust mutex.
[main] pthread_mutex_lock -> Previous owner died.
[main] Now make the mutex consistent
[main] Mutex is now consistent; unlocking
' in '[original owner] Setting lock...
[original owner] Locked. Now exiting without unlocking.
[main] Attempting to lock the robust mutex.
[main] pthread_mutex_lock -> Owner died.
[main] Now make the mutex consistent
[main] Mutex is now consistent; unlocking
', diff:

--- expected
+++ actual
@@ -1,7 +1,7 @@
 [original owner] Setting lock...
 [original owner] Locked. Now exiting without unlocking.
 [main] Attempting to lock the robust mutex.
-[main] pthread_mutex_lock -> Previous owner died.
+[main] pthread_mutex_lock -> Owner died.
 [main] Now make the mutex consistent
 [main] Mutex is now consistent; unlocking




----------------------------------------------------------------------
Ran 1 test in 0.856s

FAILED (failures=1)

@google-yfyang
Copy link
Collaborator Author

Can you also update the "Owner died" message. See #25008

Done.

@sbc100 sbc100 enabled auto-merge (squash) August 26, 2025 15:14
@sbc100 sbc100 merged commit 4aa1f81 into emscripten-core:main Aug 26, 2025
30 checks passed
@juj
Copy link
Collaborator

juj commented Aug 26, 2025

Given that llvm-libc suite now passes, I added it to run as part of my local test lab CI suite at http://clbri.com:8010/#/builders

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants