about summary refs log tree commit diff
path: root/nptl/Makefile
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/Makefile
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/Makefile')
-rw-r--r--nptl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index d0f8286fb8..cce512f33b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -224,7 +224,7 @@ tests = tst-typesizes \
 	tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
 	tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
 	tst-raise1 \
-	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 \
+	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 \
 	tst-detach1 \
 	tst-eintr1 tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
 	tst-tsd1 tst-tsd2 tst-tsd3 tst-tsd4 tst-tsd5 \