From 82e715b2770258fa2c536aeae1f46c7fccdcdecf Mon Sep 17 00:00:00 2001 From: Holger Ihrig Date: Fri, 26 Aug 2011 12:56:14 +0200 Subject: [PATCH] Moving relevant tests to corelib/thread Task-number: QTBUG-21066 Change-Id: Ia16fa8961f1a73f4da6709197b5dd9929c16583f Reviewed-on: http://codereview.qt.nokia.com/3663 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern Reviewed-by: Jason McDonald --- tests/auto/corelib.pro | 12 ------------ tests/auto/corelib/corelib.pro | 3 ++- .../{ => corelib/thread}/qatomicint/.gitignore | 0 .../{ => corelib/thread}/qatomicint/qatomicint.pro | 0 .../thread}/qatomicint/tst_qatomicint.cpp | 0 .../{ => corelib/thread}/qatomicpointer/.gitignore | 0 .../thread}/qatomicpointer/qatomicpointer.pro | 0 .../thread}/qatomicpointer/tst_qatomicpointer.cpp | 0 tests/auto/{ => corelib/thread}/qmutex/.gitignore | 0 tests/auto/{ => corelib/thread}/qmutex/qmutex.pro | 0 .../{ => corelib/thread}/qmutex/tst_qmutex.cpp | 0 .../{ => corelib/thread}/qmutexlocker/.gitignore | 0 .../thread}/qmutexlocker/qmutexlocker.pro | 0 .../thread}/qmutexlocker/tst_qmutexlocker.cpp | 0 .../{ => corelib/thread}/qreadlocker/.gitignore | 0 .../thread}/qreadlocker/qreadlocker.pro | 0 .../thread}/qreadlocker/tst_qreadlocker.cpp | 0 .../{ => corelib/thread}/qreadwritelock/.gitignore | 0 .../thread}/qreadwritelock/qreadwritelock.pro | 0 .../thread}/qreadwritelock/tst_qreadwritelock.cpp | 0 .../{ => corelib/thread}/qsemaphore/.gitignore | 0 .../{ => corelib/thread}/qsemaphore/qsemaphore.pro | 0 .../thread}/qsemaphore/tst_qsemaphore.cpp | 0 tests/auto/{ => corelib/thread}/qthread/.gitignore | 0 .../auto/{ => corelib/thread}/qthread/qthread.pro | 0 .../{ => corelib/thread}/qthread/tst_qthread.cpp | 0 .../{ => corelib/thread}/qthreadonce/.gitignore | 0 .../thread}/qthreadonce/qthreadonce.cpp | 0 .../{ => corelib/thread}/qthreadonce/qthreadonce.h | 0 .../thread}/qthreadonce/qthreadonce.pro | 0 .../thread}/qthreadonce/tst_qthreadonce.cpp | 0 .../{ => corelib/thread}/qthreadstorage/.gitignore | 0 .../thread}/qthreadstorage/crashOnExit.cpp | 0 .../thread}/qthreadstorage/crashOnExit.pro | 0 .../thread}/qthreadstorage/qthreadstorage.pro | 0 .../thread}/qthreadstorage/tst_qthreadstorage.cpp | 0 .../thread}/qthreadstorage/tst_qthreadstorage.pro | 0 .../{ => corelib/thread}/qwaitcondition/.gitignore | 0 .../thread}/qwaitcondition/qwaitcondition.pro | 0 .../thread}/qwaitcondition/tst_qwaitcondition.cpp | 0 .../{ => corelib/thread}/qwritelocker/.gitignore | 0 .../thread}/qwritelocker/qwritelocker.pro | 0 .../thread}/qwritelocker/tst_qwritelocker.cpp | 0 tests/auto/corelib/thread/thread.pro | 14 ++++++++++++++ 44 files changed, 16 insertions(+), 13 deletions(-) rename tests/auto/{ => corelib/thread}/qatomicint/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qatomicint/qatomicint.pro (100%) rename tests/auto/{ => corelib/thread}/qatomicint/tst_qatomicint.cpp (100%) rename tests/auto/{ => corelib/thread}/qatomicpointer/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qatomicpointer/qatomicpointer.pro (100%) rename tests/auto/{ => corelib/thread}/qatomicpointer/tst_qatomicpointer.cpp (100%) rename tests/auto/{ => corelib/thread}/qmutex/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qmutex/qmutex.pro (100%) rename tests/auto/{ => corelib/thread}/qmutex/tst_qmutex.cpp (100%) rename tests/auto/{ => corelib/thread}/qmutexlocker/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qmutexlocker/qmutexlocker.pro (100%) rename tests/auto/{ => corelib/thread}/qmutexlocker/tst_qmutexlocker.cpp (100%) rename tests/auto/{ => corelib/thread}/qreadlocker/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qreadlocker/qreadlocker.pro (100%) rename tests/auto/{ => corelib/thread}/qreadlocker/tst_qreadlocker.cpp (100%) rename tests/auto/{ => corelib/thread}/qreadwritelock/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qreadwritelock/qreadwritelock.pro (100%) rename tests/auto/{ => corelib/thread}/qreadwritelock/tst_qreadwritelock.cpp (100%) rename tests/auto/{ => corelib/thread}/qsemaphore/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qsemaphore/qsemaphore.pro (100%) rename tests/auto/{ => corelib/thread}/qsemaphore/tst_qsemaphore.cpp (100%) rename tests/auto/{ => corelib/thread}/qthread/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qthread/qthread.pro (100%) rename tests/auto/{ => corelib/thread}/qthread/tst_qthread.cpp (100%) rename tests/auto/{ => corelib/thread}/qthreadonce/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qthreadonce/qthreadonce.cpp (100%) rename tests/auto/{ => corelib/thread}/qthreadonce/qthreadonce.h (100%) rename tests/auto/{ => corelib/thread}/qthreadonce/qthreadonce.pro (100%) rename tests/auto/{ => corelib/thread}/qthreadonce/tst_qthreadonce.cpp (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/crashOnExit.cpp (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/crashOnExit.pro (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/qthreadstorage.pro (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/tst_qthreadstorage.cpp (100%) rename tests/auto/{ => corelib/thread}/qthreadstorage/tst_qthreadstorage.pro (100%) rename tests/auto/{ => corelib/thread}/qwaitcondition/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qwaitcondition/qwaitcondition.pro (100%) rename tests/auto/{ => corelib/thread}/qwaitcondition/tst_qwaitcondition.cpp (100%) rename tests/auto/{ => corelib/thread}/qwritelocker/.gitignore (100%) rename tests/auto/{ => corelib/thread}/qwritelocker/qwritelocker.pro (100%) rename tests/auto/{ => corelib/thread}/qwritelocker/tst_qwritelocker.cpp (100%) create mode 100644 tests/auto/corelib/thread/thread.pro diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index f3b78c6e853..1467db72877 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -3,8 +3,6 @@ SUBDIRS=\ corelib \ collections \ exceptionsafety \ - qatomicint \ - qatomicpointer \ qbitarray \ qbytearray \ qbytearraymatcher \ @@ -22,19 +20,14 @@ SUBDIRS=\ qline \ qmap \ qmargins \ - qmutex \ - qmutexlocker \ qobjectrace \ qpoint \ qqueue \ - qreadlocker \ - qreadwritelock \ qrect \ qregexp \ qringbuffer \ qscopedpointer \ qscopedvaluerollback \ - qsemaphore \ qset \ qsharedpointer \ qsignalspy \ @@ -50,16 +43,11 @@ SUBDIRS=\ qstringmatcher \ qstringref \ qtextboundaryfinder \ - qthread \ - qthreadonce \ - qthreadstorage \ qtime \ qtimeline \ qtmd5 \ qtokenautomaton \ qvarlengtharray \ qvector \ - qwaitcondition \ - qwritelocker \ selftests \ utf8 diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro index 03a7035af06..62532b968fb 100644 --- a/tests/auto/corelib/corelib.pro +++ b/tests/auto/corelib/corelib.pro @@ -7,4 +7,5 @@ SUBDIRS=\ io \ kernel \ plugin \ - statemachine + statemachine \ + thread diff --git a/tests/auto/qatomicint/.gitignore b/tests/auto/corelib/thread/qatomicint/.gitignore similarity index 100% rename from tests/auto/qatomicint/.gitignore rename to tests/auto/corelib/thread/qatomicint/.gitignore diff --git a/tests/auto/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro similarity index 100% rename from tests/auto/qatomicint/qatomicint.pro rename to tests/auto/corelib/thread/qatomicint/qatomicint.pro diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp similarity index 100% rename from tests/auto/qatomicint/tst_qatomicint.cpp rename to tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp diff --git a/tests/auto/qatomicpointer/.gitignore b/tests/auto/corelib/thread/qatomicpointer/.gitignore similarity index 100% rename from tests/auto/qatomicpointer/.gitignore rename to tests/auto/corelib/thread/qatomicpointer/.gitignore diff --git a/tests/auto/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro similarity index 100% rename from tests/auto/qatomicpointer/qatomicpointer.pro rename to tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp similarity index 100% rename from tests/auto/qatomicpointer/tst_qatomicpointer.cpp rename to tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp diff --git a/tests/auto/qmutex/.gitignore b/tests/auto/corelib/thread/qmutex/.gitignore similarity index 100% rename from tests/auto/qmutex/.gitignore rename to tests/auto/corelib/thread/qmutex/.gitignore diff --git a/tests/auto/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro similarity index 100% rename from tests/auto/qmutex/qmutex.pro rename to tests/auto/corelib/thread/qmutex/qmutex.pro diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp similarity index 100% rename from tests/auto/qmutex/tst_qmutex.cpp rename to tests/auto/corelib/thread/qmutex/tst_qmutex.cpp diff --git a/tests/auto/qmutexlocker/.gitignore b/tests/auto/corelib/thread/qmutexlocker/.gitignore similarity index 100% rename from tests/auto/qmutexlocker/.gitignore rename to tests/auto/corelib/thread/qmutexlocker/.gitignore diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro similarity index 100% rename from tests/auto/qmutexlocker/qmutexlocker.pro rename to tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp similarity index 100% rename from tests/auto/qmutexlocker/tst_qmutexlocker.cpp rename to tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp diff --git a/tests/auto/qreadlocker/.gitignore b/tests/auto/corelib/thread/qreadlocker/.gitignore similarity index 100% rename from tests/auto/qreadlocker/.gitignore rename to tests/auto/corelib/thread/qreadlocker/.gitignore diff --git a/tests/auto/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro similarity index 100% rename from tests/auto/qreadlocker/qreadlocker.pro rename to tests/auto/corelib/thread/qreadlocker/qreadlocker.pro diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp similarity index 100% rename from tests/auto/qreadlocker/tst_qreadlocker.cpp rename to tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp diff --git a/tests/auto/qreadwritelock/.gitignore b/tests/auto/corelib/thread/qreadwritelock/.gitignore similarity index 100% rename from tests/auto/qreadwritelock/.gitignore rename to tests/auto/corelib/thread/qreadwritelock/.gitignore diff --git a/tests/auto/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro similarity index 100% rename from tests/auto/qreadwritelock/qreadwritelock.pro rename to tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp similarity index 100% rename from tests/auto/qreadwritelock/tst_qreadwritelock.cpp rename to tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp diff --git a/tests/auto/qsemaphore/.gitignore b/tests/auto/corelib/thread/qsemaphore/.gitignore similarity index 100% rename from tests/auto/qsemaphore/.gitignore rename to tests/auto/corelib/thread/qsemaphore/.gitignore diff --git a/tests/auto/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro similarity index 100% rename from tests/auto/qsemaphore/qsemaphore.pro rename to tests/auto/corelib/thread/qsemaphore/qsemaphore.pro diff --git a/tests/auto/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp similarity index 100% rename from tests/auto/qsemaphore/tst_qsemaphore.cpp rename to tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp diff --git a/tests/auto/qthread/.gitignore b/tests/auto/corelib/thread/qthread/.gitignore similarity index 100% rename from tests/auto/qthread/.gitignore rename to tests/auto/corelib/thread/qthread/.gitignore diff --git a/tests/auto/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro similarity index 100% rename from tests/auto/qthread/qthread.pro rename to tests/auto/corelib/thread/qthread/qthread.pro diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp similarity index 100% rename from tests/auto/qthread/tst_qthread.cpp rename to tests/auto/corelib/thread/qthread/tst_qthread.cpp diff --git a/tests/auto/qthreadonce/.gitignore b/tests/auto/corelib/thread/qthreadonce/.gitignore similarity index 100% rename from tests/auto/qthreadonce/.gitignore rename to tests/auto/corelib/thread/qthreadonce/.gitignore diff --git a/tests/auto/qthreadonce/qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/qthreadonce.cpp similarity index 100% rename from tests/auto/qthreadonce/qthreadonce.cpp rename to tests/auto/corelib/thread/qthreadonce/qthreadonce.cpp diff --git a/tests/auto/qthreadonce/qthreadonce.h b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h similarity index 100% rename from tests/auto/qthreadonce/qthreadonce.h rename to tests/auto/corelib/thread/qthreadonce/qthreadonce.h diff --git a/tests/auto/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro similarity index 100% rename from tests/auto/qthreadonce/qthreadonce.pro rename to tests/auto/corelib/thread/qthreadonce/qthreadonce.pro diff --git a/tests/auto/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp similarity index 100% rename from tests/auto/qthreadonce/tst_qthreadonce.cpp rename to tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp diff --git a/tests/auto/qthreadstorage/.gitignore b/tests/auto/corelib/thread/qthreadstorage/.gitignore similarity index 100% rename from tests/auto/qthreadstorage/.gitignore rename to tests/auto/corelib/thread/qthreadstorage/.gitignore diff --git a/tests/auto/qthreadstorage/crashOnExit.cpp b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp similarity index 100% rename from tests/auto/qthreadstorage/crashOnExit.cpp rename to tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp diff --git a/tests/auto/qthreadstorage/crashOnExit.pro b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro similarity index 100% rename from tests/auto/qthreadstorage/crashOnExit.pro rename to tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro similarity index 100% rename from tests/auto/qthreadstorage/qthreadstorage.pro rename to tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp similarity index 100% rename from tests/auto/qthreadstorage/tst_qthreadstorage.cpp rename to tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro similarity index 100% rename from tests/auto/qthreadstorage/tst_qthreadstorage.pro rename to tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro diff --git a/tests/auto/qwaitcondition/.gitignore b/tests/auto/corelib/thread/qwaitcondition/.gitignore similarity index 100% rename from tests/auto/qwaitcondition/.gitignore rename to tests/auto/corelib/thread/qwaitcondition/.gitignore diff --git a/tests/auto/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro similarity index 100% rename from tests/auto/qwaitcondition/qwaitcondition.pro rename to tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp similarity index 100% rename from tests/auto/qwaitcondition/tst_qwaitcondition.cpp rename to tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp diff --git a/tests/auto/qwritelocker/.gitignore b/tests/auto/corelib/thread/qwritelocker/.gitignore similarity index 100% rename from tests/auto/qwritelocker/.gitignore rename to tests/auto/corelib/thread/qwritelocker/.gitignore diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro similarity index 100% rename from tests/auto/qwritelocker/qwritelocker.pro rename to tests/auto/corelib/thread/qwritelocker/qwritelocker.pro diff --git a/tests/auto/qwritelocker/tst_qwritelocker.cpp b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp similarity index 100% rename from tests/auto/qwritelocker/tst_qwritelocker.cpp rename to tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro new file mode 100644 index 00000000000..a137748b75a --- /dev/null +++ b/tests/auto/corelib/thread/thread.pro @@ -0,0 +1,14 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qatomicint \ + qatomicpointer \ + qmutex \ + qmutexlocker \ + qreadlocker \ + qreadwritelock \ + qsemaphore \ + qthread \ + qthreadonce \ + qthreadstorage \ + qwaitcondition \ + qwritelocker