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 5304936a801cbe8525dd52a537172888a7dfedbd..1fe94089a69bfda2d6f288b9e333f5767934169d 100644 (file)
--- 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 21be3cf1af3693136284d33c4f6a2097025ce9c3..c17edb19a07a449c8f6633d594946418be0d7cbb 100644 (file)
--- 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 29ccfd19213ab537a7fc26bc9ec23367eaaeb5c8..17f2fb6e3d41cb9f0bb4903d38e19fb6f27a684c 100644 (file)
--- 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;