From: Nicholas Nethercote <njn@valgrind.org>
Date: Tue, 20 Jan 2009 22:54:50 +0000 (+0000)
Subject: A couple more changes to fix the conditional building of DRD tests.
X-Git-Tag: svn/VALGRIND_3_5_0~1073
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74e8c02cea47eb9af4a28bc3e67cbf4b4803f4bc;p=thirdparty%2Fvalgrind.git

A couple more changes to fix the conditional building of DRD tests.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9002
---

diff --git a/drd/tests/pth_barrier2.vgtest b/drd/tests/pth_barrier2.vgtest
index 5304936a80..1fe94089a6 100644
--- a/drd/tests/pth_barrier2.vgtest
+++ b/drd/tests/pth_barrier2.vgtest
@@ -1,4 +1,4 @@
-prereq: ./supported_libpthread
+prereq: test -e pth_barrier && ./supported_libpthread
 prog: pth_barrier
 args: 2 32 1
 stderr_filter: filter_error_summary
diff --git a/drd/tests/pth_barrier3.vgtest b/drd/tests/pth_barrier3.vgtest
index 21be3cf1af..c17edb19a0 100644
--- a/drd/tests/pth_barrier3.vgtest
+++ b/drd/tests/pth_barrier3.vgtest
@@ -1,4 +1,4 @@
-prereq: ./supported_libpthread
+prereq: test -e pth_barrier && ./supported_libpthread
 prog: pth_barrier
 args: 32 1 1
 stderr_filter: filter_error_summary
diff --git a/drd/tests/trylock.c b/drd/tests/trylock.c
index 29ccfd1921..17f2fb6e3d 100644
--- a/drd/tests/trylock.c
+++ b/drd/tests/trylock.c
@@ -68,8 +68,10 @@ int main(int argc, char** argv)
   r = pthread_mutex_lock(&mutex); assert(r == 0);
   r = pthread_mutex_unlock(&mutex); assert(r == 0);
   fprintf(stderr, "Locking mutex via pthread_mutex_timedlock().\n");
+#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK
   r = pthread_mutex_timedlock(&mutex, &abs_timeout); assert(r == 0);
   r = pthread_mutex_unlock(&mutex); assert(r == 0);
+#endif
   r = pthread_mutex_destroy(&mutex); assert(r == 0);
 
   return 0;