Update other.test_{proxy,main}_pthread_join_detach exception

Already-detached threads that are attempting to detach themselves will always cause EDEADLK.

Author: kleisauke

system/lib/libc/musl/src/thread/pthread_join.c

@@ -17,9 +17,8 @@ static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec
 	// Attempt to join a thread which does not point to a valid thread, or
 	// does not exist anymore.
 	if (t->self != t) return ESRCH;
-	// Thread is attempting to join to itself.  Already detached threads are
-	// handled below by returning EINVAL instead.
-	if (t->detach_state != DT_DETACHED && __pthread_self() == t) return EDEADLK;
+	// Thread is attempting to join to itself.
+	if (__pthread_self() == t) return EDEADLK;
 #endif
 	int state, cs, r = 0;
 	__pthread_testcancel();

tests/other/test_pthread_self_join_detach.c

@@ -21,34 +21,28 @@ int main() {
   pthread_t self = pthread_self();
 
   /*
-   * Attempts to join the current thread will either generate
-   * EDEADLK or EINVAL depending on whether has already been
-   * detached
+   * Attempts to join the current thread will cause EDEADLK.
    */
   int ret = pthread_join(self, NULL);
   printf("pthread_join -> %s\n", strerror(ret));
-  if (is_detached) {
-    assert(ret == EINVAL);
-  } else {
-    assert(ret == EDEADLK);
-  }
+  assert(ret == EDEADLK);
 
   /*
    * Attempts to detach the main thread will either succeed
    * or cause EINVAL if its already been detached.
+   *
+   * Note that musl causes EDEADLK when already-detached threads
+   * are attempting to detach itself, since it re-uses code from
+   * pthread_join.
    */
   ret = pthread_detach(self);
   printf("pthread_detach(self) -> %s\n", strerror(ret));
   if (is_detached) {
-    assert(ret == EINVAL);
+    assert(ret == EDEADLK);
   } else {
     assert(ret == 0);
   }
 
-  ret = pthread_join(self, NULL);
-  printf("pthread_join -> %s\n", strerror(ret));
-  assert(ret == EINVAL);
-
   puts("passed");
 
   return 0;