From: Julian Seward <jseward@acm.org>
Date: Fri, 18 Jul 2008 21:03:11 +0000 (+0000)
Subject: Temporarily disable Qt4-related tests, as they don't build on systems
X-Git-Tag: svn/VALGRIND_3_4_0~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84747b6cc683438bcf114d7611387a67dc38c6e1;p=thirdparty%2Fvalgrind.git

Temporarily disable Qt4-related tests, as they don't build on systems
with qt-4.2.1 at least.  It appears the type of QMutex::tryLock has
changed somewhere after qt-4.2.1.



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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index fb1bb22ab1..c8d162e285 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -238,9 +238,9 @@ check_PROGRAMS =      \
   tc24_nonzero_sem    \
   trylock
 
-if HAVE_QTCORE
-check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore
-endif
+#if HAVE_QTCORE
+#check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore
+#endif
 
 if HAVE_OPENMP
 check_PROGRAMS += omp_matinv omp_prime
@@ -316,16 +316,16 @@ pth_inconsistent_cond_wait_LDADD   = -lpthread
 pth_spinlock_SOURCES        = pth_spinlock.c
 pth_spinlock_LDADD          = -lpthread
 
-if HAVE_QTCORE
-qt4_mutex_SOURCES           = qt4_mutex.cpp
-qt4_mutex_LDADD             = -lQtCore -lpthread
-
-qt4_rwlock_SOURCES          = qt4_rwlock.cpp
-qt4_rwlock_LDADD            = -lQtCore -lpthread
-
-qt4_semaphore_SOURCES       = qt4_semaphore.cpp
-qt4_semaphore_LDADD         = -lQtCore -lpthread
-endif
+#if HAVE_QTCORE
+#qt4_mutex_SOURCES           = qt4_mutex.cpp
+#qt4_mutex_LDADD             = -lQtCore -lpthread
+#
+#qt4_rwlock_SOURCES          = qt4_rwlock.cpp
+#qt4_rwlock_LDADD            = -lQtCore -lpthread
+#
+#qt4_semaphore_SOURCES       = qt4_semaphore.cpp
+#qt4_semaphore_LDADD         = -lQtCore -lpthread
+#endif
 
 recursive_mutex_SOURCES     = recursive_mutex.c
 recursive_mutex_LDADD       = -lpthread