summaryrefslogtreecommitdiff
path: root/nptl/tst-mutex3.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-07-29 23:12:43 +0000
committerRoland McGrath <roland@gnu.org>2006-07-29 23:12:43 +0000
commitab5823b4b6e760345d347b98830ccc75aa81bff6 (patch)
treef9b25d5f9a16e7ce0318aaf3adcccec0e83fd804 /nptl/tst-mutex3.c
parentaa583d2ff9fca922771d88f1afa255847f2aa4ed (diff)
Updated to fedora-glibc-20060729T2255cvs/fedora-glibc-2_4_90-14
Diffstat (limited to 'nptl/tst-mutex3.c')
-rw-r--r--nptl/tst-mutex3.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/nptl/tst-mutex3.c b/nptl/tst-mutex3.c
index 8e57924ba6..2848096538 100644
--- a/nptl/tst-mutex3.c
+++ b/nptl/tst-mutex3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -113,8 +113,25 @@ do_test (void)
return 1;
}
- if (pthread_mutex_init (&m, &a) != 0)
+#ifdef ENABLE_PI
+ if (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT) != 0)
{
+ puts ("pthread_mutexattr_setprotocol failed");
+ return 1;
+ }
+#endif
+
+ int e;
+ e = pthread_mutex_init (&m, &a);
+ if (e != 0)
+ {
+#ifdef ENABLE_PI
+ if (e == ENOTSUP)
+ {
+ puts ("PI mutexes unsupported");
+ return 0;
+ }
+#endif
puts ("mutex_init failed");
return 1;
}
@@ -162,7 +179,7 @@ do_test (void)
return 1;
}
- int e = pthread_barrier_wait (&b);
+ e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("barrier_wait failed");