about summary refs log tree commit diff
path: root/nptl/tst-join6.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-13 01:56:09 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-13 01:56:09 +0000
commit22bb134c318365dbac664e46c193538c14bf3c42 (patch)
tree6ec10e5142ec9266baf7c0cca31bf7e766804263 /nptl/tst-join6.c
parent4c3f81d07ae921bb58def1f34c8758a77989b219 (diff)
downloadglibc-22bb134c318365dbac664e46c193538c14bf3c42.tar.gz
glibc-22bb134c318365dbac664e46c193538c14bf3c42.tar.xz
glibc-22bb134c318365dbac664e46c193538c14bf3c42.zip
[BZ #2843]
2006-08-12  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2843]
	* pthread_join.c (pthread_join): Account for self being canceled
	when checking for deadlocks.
	* tst-join5.c: Cleanups.  Allow to be used in tst-join6.
	(tf1): Don't print anything after pthread_join returns, this would be
	another cancellation point.
	(tf2): Likewise.
	* tst-join6.c: New file.
	* Makefile (tests): Add tst-join6.
Diffstat (limited to 'nptl/tst-join6.c')
-rw-r--r--nptl/tst-join6.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/nptl/tst-join6.c b/nptl/tst-join6.c
new file mode 100644
index 0000000000..0c9e7c056b
--- /dev/null
+++ b/nptl/tst-join6.c
@@ -0,0 +1,2 @@
+#define WAIT_IN_CHILD 1
+#include "tst-join5.c"