From feaf65b7572aca5d4f24fb942c32ab2d0ebaba32 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 23 Oct 2011 15:21:48 +0000 Subject: [PATCH] Remove the Qt4 regression tests because these are too hard to maintain git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12220 --- drd/tests/Makefile.am | 8 --- drd/tests/qt4_atomic.cpp | 65 --------------------- drd/tests/qt4_atomic.stderr.exp | 5 -- drd/tests/qt4_atomic.vgtest | 3 - drd/tests/qt4_mutex.cpp | 92 ----------------------------- drd/tests/qt4_mutex.stderr.exp | 5 -- drd/tests/qt4_mutex.vgtest | 3 - drd/tests/qt4_rwlock.cpp | 93 ------------------------------ drd/tests/qt4_rwlock.stderr.exp | 5 -- drd/tests/qt4_rwlock.vgtest | 3 - drd/tests/qt4_semaphore.cpp | 82 -------------------------- drd/tests/qt4_semaphore.stderr.exp | 5 -- drd/tests/qt4_semaphore.vgtest | 3 - 13 files changed, 372 deletions(-) delete mode 100644 drd/tests/qt4_atomic.cpp delete mode 100644 drd/tests/qt4_atomic.stderr.exp delete mode 100644 drd/tests/qt4_atomic.vgtest delete mode 100644 drd/tests/qt4_mutex.cpp delete mode 100644 drd/tests/qt4_mutex.stderr.exp delete mode 100644 drd/tests/qt4_mutex.vgtest delete mode 100644 drd/tests/qt4_rwlock.cpp delete mode 100644 drd/tests/qt4_rwlock.stderr.exp delete mode 100644 drd/tests/qt4_rwlock.vgtest delete mode 100644 drd/tests/qt4_semaphore.cpp delete mode 100644 drd/tests/qt4_semaphore.stderr.exp delete mode 100644 drd/tests/qt4_semaphore.vgtest diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 94b2f3d263..f13e4cfddd 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -189,14 +189,6 @@ EXTRA_DIST = \ pth_spinlock.vgtest \ pth_uninitialized_cond.stderr.exp \ pth_uninitialized_cond.vgtest \ - qt4_atomic.stderr.exp \ - qt4_atomic.vgtest \ - qt4_mutex.stderr.exp \ - qt4_mutex.vgtest \ - qt4_rwlock.stderr.exp \ - qt4_rwlock.vgtest \ - qt4_semaphore.stderr.exp \ - qt4_semaphore.vgtest \ read_and_free_race.stderr.exp \ read_and_free_race.vgtest \ recursive_mutex.stderr.exp-linux \ diff --git a/drd/tests/qt4_atomic.cpp b/drd/tests/qt4_atomic.cpp deleted file mode 100644 index b3b84f6bc9..0000000000 --- a/drd/tests/qt4_atomic.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/// Test program that uses the QAtomicInt class. - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include "config.h" -#include // class QAtomicInt -#include -#include // fprintf() -#include // atoi() -#include -#include // pthread_barrier_t -#include - - -static pthread_barrier_t s_barrier; -static QAtomicInt* s_pAtomicInt; - - -void* thread_func(void* pArg) -{ - const int iArg = *reinterpret_cast(pArg); - - pthread_barrier_wait(&s_barrier); - - while (! s_pAtomicInt->testAndSetOrdered(iArg, iArg + 1)) - ; - - return NULL; -} - -int main(int argc, char** argv) -{ - int i; - const int n_threads = 10; - std::vector thread_arg(n_threads); - std::vector tid(n_threads); - - fprintf(stderr, "Start of test.\n"); - - pthread_barrier_init(&s_barrier, 0, n_threads); - s_pAtomicInt = new QAtomicInt(); - for (i = 0; i < n_threads; i++) - { - thread_arg[i] = i; - pthread_create(&tid[i], 0, thread_func, &thread_arg[i]); - } - for (i = 0; i < n_threads; i++) - { - pthread_join(tid[i], NULL); - } - pthread_barrier_destroy(&s_barrier); - - if (*s_pAtomicInt == n_threads) - fprintf(stderr, "Test successful.\n"); - else - fprintf(stderr, "Test failed: counter = %d, should be %d\n", - static_cast(*s_pAtomicInt), n_threads); - - delete s_pAtomicInt; - s_pAtomicInt = 0; - - return 0; -} diff --git a/drd/tests/qt4_atomic.stderr.exp b/drd/tests/qt4_atomic.stderr.exp deleted file mode 100644 index 21dba22019..0000000000 --- a/drd/tests/qt4_atomic.stderr.exp +++ /dev/null @@ -1,5 +0,0 @@ - -Start of test. -Test successful. - -ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) diff --git a/drd/tests/qt4_atomic.vgtest b/drd/tests/qt4_atomic.vgtest deleted file mode 100644 index a35435a674..0000000000 --- a/drd/tests/qt4_atomic.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e qt4_atomic -vgopts: --check-stack-var=yes -prog: qt4_atomic diff --git a/drd/tests/qt4_mutex.cpp b/drd/tests/qt4_mutex.cpp deleted file mode 100644 index c20b163f2c..0000000000 --- a/drd/tests/qt4_mutex.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/// Qt4 mutex test. - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include "config.h" -#include // class QMutex -#include // class QThread -#include -#include // fprintf() -#include // atoi() -#include -#include // pthread_barrier_t -#include - - -static pthread_barrier_t s_barrier; -static QMutex* s_pMutex; -static int s_iterations; -static int s_counter; - - -class IncThread: public QThread -{ - virtual void run(); -}; - -void IncThread::run() -{ - int i; - - pthread_barrier_wait(&s_barrier); - for (i = s_iterations; i > 0; i--) - { - s_pMutex->lock(); - s_counter++; - s_pMutex->unlock(); - } -} - -int main(int argc, char** argv) -{ - int i; - const int n_threads = 10; - std::vector tid(n_threads); - - s_iterations = argc > 1 ? atoi(argv[1]) : 1000; - - fprintf(stderr, "Start of test.\n"); - - { - // Stack-allocated mutex. - QMutex M(QMutex::Recursive); - M.lock(); - assert(M.tryLock()); - M.unlock(); - M.unlock(); - } -#if defined(HAVE_QTCORE_QMUTEX_TRYLOCK_INT) - { - QMutex M(QMutex::NonRecursive); - assert(M.tryLock(1)); - assert(! M.tryLock(1)); - M.unlock(); - } -#endif - - pthread_barrier_init(&s_barrier, 0, n_threads); - s_pMutex = new QMutex(); - for (i = 0; i < n_threads; i++) - { - tid[i] = new IncThread; - tid[i]->start(); - } - for (i = 0; i < n_threads; i++) - { - tid[i]->wait(); - delete tid[i]; - } - delete s_pMutex; - s_pMutex = 0; - pthread_barrier_destroy(&s_barrier); - - if (s_counter == n_threads * s_iterations) - fprintf(stderr, "Test successful.\n"); - else - fprintf(stderr, "Test failed: counter = %d, should be %d\n", - s_counter, n_threads * s_iterations); - - return 0; -} diff --git a/drd/tests/qt4_mutex.stderr.exp b/drd/tests/qt4_mutex.stderr.exp deleted file mode 100644 index 21dba22019..0000000000 --- a/drd/tests/qt4_mutex.stderr.exp +++ /dev/null @@ -1,5 +0,0 @@ - -Start of test. -Test successful. - -ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) diff --git a/drd/tests/qt4_mutex.vgtest b/drd/tests/qt4_mutex.vgtest deleted file mode 100644 index 1015fff765..0000000000 --- a/drd/tests/qt4_mutex.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e qt4_mutex -vgopts: --check-stack-var=yes -prog: qt4_mutex diff --git a/drd/tests/qt4_rwlock.cpp b/drd/tests/qt4_rwlock.cpp deleted file mode 100644 index db9cf24e7c..0000000000 --- a/drd/tests/qt4_rwlock.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/// Qt4 reader-writer lock test. - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include // class QThread -#include // class QReadWriteLock -#include // fprintf() -#include // atoi() -#include -#include // pthread_barrier_t -#include - - -static pthread_barrier_t s_barrier; -static QReadWriteLock* s_pRWlock; -static int s_iterations; -static int s_counter; - - -class IncThread: public QThread -{ -public: - IncThread(); - virtual ~IncThread(); - -private: - virtual void run(); -}; - -IncThread::IncThread() -{ } - -IncThread::~IncThread() -{ } - -void IncThread::run() -{ - int i; - - pthread_barrier_wait(&s_barrier); - for (i = s_iterations; i > 0; i--) - { - s_pRWlock->lockForWrite(); - s_counter++; - s_pRWlock->unlock(); - } -} - -int main(int argc, char** argv) -{ - int i; - const int n_threads = 10; - std::vector tid(n_threads); - - s_iterations = argc > 1 ? atoi(argv[1]) : 1000; - - fprintf(stderr, "Start of test.\n"); - - { - // Stack-allocated reader-writer lock. - QReadWriteLock RWL; - RWL.lockForRead(); - RWL.unlock(); - RWL.lockForWrite(); - RWL.unlock(); - } - - pthread_barrier_init(&s_barrier, 0, n_threads); - s_pRWlock = new QReadWriteLock(); - for (i = 0; i < n_threads; i++) - { - tid[i] = new IncThread; - tid[i]->start(); - } - for (i = 0; i < n_threads; i++) - { - tid[i]->wait(); - delete tid[i]; - } - delete s_pRWlock; - s_pRWlock = 0; - pthread_barrier_destroy(&s_barrier); - - if (s_counter == n_threads * s_iterations) - fprintf(stderr, "Test successful.\n"); - else - fprintf(stderr, "Test failed: counter = %d, should be %d\n", - s_counter, n_threads * s_iterations); - - return 0; -} diff --git a/drd/tests/qt4_rwlock.stderr.exp b/drd/tests/qt4_rwlock.stderr.exp deleted file mode 100644 index 21dba22019..0000000000 --- a/drd/tests/qt4_rwlock.stderr.exp +++ /dev/null @@ -1,5 +0,0 @@ - -Start of test. -Test successful. - -ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) diff --git a/drd/tests/qt4_rwlock.vgtest b/drd/tests/qt4_rwlock.vgtest deleted file mode 100644 index 8619d934c7..0000000000 --- a/drd/tests/qt4_rwlock.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e qt4_rwlock -vgopts: --check-stack-var=yes -prog: qt4_rwlock diff --git a/drd/tests/qt4_semaphore.cpp b/drd/tests/qt4_semaphore.cpp deleted file mode 100644 index 5143c75bd0..0000000000 --- a/drd/tests/qt4_semaphore.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/// Qt4 semaphore test. - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include // class QMutex -#include // class QSemaphore -#include // fprintf() -#include // atoi() -#include -#include // pthread_barrier_t -#include - - -static pthread_barrier_t s_barrier; -static QSemaphore* s_pSema; -static int s_iterations; -static int s_counter; - - -class IncThread: public QThread -{ - virtual void run(); -}; - -void IncThread::run() -{ - int i; - - pthread_barrier_wait(&s_barrier); - for (i = s_iterations; i > 0; i--) - { - s_pSema->acquire(); - s_counter++; - s_pSema->release(); - } -} - -int main(int argc, char** argv) -{ - int i; - const int n_threads = 10; - std::vector tid(n_threads); - - s_iterations = argc > 1 ? atoi(argv[1]) : 1000; - - fprintf(stderr, "Start of test.\n"); - - { - // Stack-allocated semaphore. - QSemaphore S(1); - S.acquire(); - S.release(); - S.acquire(); - S.release(); - } - - pthread_barrier_init(&s_barrier, 0, n_threads); - s_pSema = new QSemaphore(1); - for (i = 0; i < n_threads; i++) - { - tid[i] = new IncThread; - tid[i]->start(); - } - for (i = 0; i < n_threads; i++) - { - tid[i]->wait(); - delete tid[i]; - } - delete s_pSema; - s_pSema = 0; - pthread_barrier_destroy(&s_barrier); - - if (s_counter == n_threads * s_iterations) - fprintf(stderr, "Test successful.\n"); - else - fprintf(stderr, "Test failed: counter = %d, should be %d\n", - s_counter, n_threads * s_iterations); - - return 0; -} diff --git a/drd/tests/qt4_semaphore.stderr.exp b/drd/tests/qt4_semaphore.stderr.exp deleted file mode 100644 index 21dba22019..0000000000 --- a/drd/tests/qt4_semaphore.stderr.exp +++ /dev/null @@ -1,5 +0,0 @@ - -Start of test. -Test successful. - -ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) diff --git a/drd/tests/qt4_semaphore.vgtest b/drd/tests/qt4_semaphore.vgtest deleted file mode 100644 index 771ac1509d..0000000000 --- a/drd/tests/qt4_semaphore.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e qt4_semaphore -vgopts: --check-stack-var=yes -prog: qt4_semaphore -- 2.47.2