diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-25 10:00:07 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-31 05:27:08 +0000 |
commit | 3ed22c5efe538204a496d30b881f3999c020caa7 (patch) | |
tree | d800ee30904361d801dbd5af7d34623539380259 | |
parent | 8860c26260926c586140ffb00de9d2cc9a23f783 (diff) |
tst_qsystemsemaphore: Use qt_test_helper functionality
Change-Id: I18a5d2d496e1442470423e0f05062cc2ae76a4e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/acquirerelease.pro | 5 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/main.cpp (renamed from tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/qsystemsemaphore.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/systemsemaphorehelper.pro | 17 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/test.pro | 7 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/test/test.pro | 17 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp (renamed from tests/auto/corelib/kernel/qsystemsemaphore/test/tst_qsystemsemaphore.cpp) | 17 |
7 files changed, 14 insertions, 51 deletions
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/acquirerelease.pro b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/acquirerelease.pro new file mode 100644 index 0000000000..a6156ed5b6 --- /dev/null +++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/acquirerelease.pro @@ -0,0 +1,5 @@ +QT = core testlib + +SOURCES += main.cpp + +load(qt_test_helper) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/main.cpp b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/main.cpp index 7bfb6b16cc..7bfb6b16cc 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/main.cpp +++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/main.cpp diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/corelib/kernel/qsystemsemaphore/qsystemsemaphore.pro index f8a49254d2..70526426aa 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/qsystemsemaphore.pro +++ b/tests/auto/corelib/kernel/qsystemsemaphore/qsystemsemaphore.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = systemsemaphorehelper test +SUBDIRS = acquirerelease test.pro diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/systemsemaphorehelper.pro b/tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/systemsemaphorehelper.pro deleted file mode 100644 index 389015d504..0000000000 --- a/tests/auto/corelib/kernel/qsystemsemaphore/systemsemaphorehelper/systemsemaphorehelper.pro +++ /dev/null @@ -1,17 +0,0 @@ -QT = core testlib - -win32: CONFIG += console -mac:CONFIG -= app_bundle - -SOURCES += main.cpp -TARGET = helperbinary - -CONFIG(debug_and_release) { - CONFIG(debug, debug|release) { - DESTDIR = ../debug - } else { - DESTDIR = ../release - } -} else { - DESTDIR = .. -} diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/test.pro b/tests/auto/corelib/kernel/qsystemsemaphore/test.pro new file mode 100644 index 0000000000..13bd1fa270 --- /dev/null +++ b/tests/auto/corelib/kernel/qsystemsemaphore/test.pro @@ -0,0 +1,7 @@ +CONFIG += testcase +QT = core testlib + +SOURCES += tst_qsystemsemaphore.cpp +TARGET = tst_qsystemsemaphore + +win32: CONFIG += console diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/test/test.pro b/tests/auto/corelib/kernel/qsystemsemaphore/test/test.pro deleted file mode 100644 index f60207eb01..0000000000 --- a/tests/auto/corelib/kernel/qsystemsemaphore/test/test.pro +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += testcase -QT = core testlib - -win32: CONFIG += console - -SOURCES += tst_qsystemsemaphore.cpp -TARGET = tst_qsystemsemaphore - -CONFIG(debug_and_release) { - CONFIG(debug, debug|release) { - DESTDIR = ../debug - } else { - DESTDIR = ../release - } -} else { - DESTDIR = .. -} diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/test/tst_qsystemsemaphore.cpp b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp index 6ff1e14976..5f010ae3d1 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/test/tst_qsystemsemaphore.cpp +++ b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp @@ -42,7 +42,6 @@ public: tst_QSystemSemaphore(); public Q_SLOTS: - void initTestCase(); void init(); void cleanup(); @@ -65,22 +64,16 @@ private slots: void initialValue(); private: - static QString helperBinary(); QSystemSemaphore *existingLock; const QString m_helperBinary; }; tst_QSystemSemaphore::tst_QSystemSemaphore() - : m_helperBinary(helperBinary()) + : m_helperBinary("acquirerelease_helper") { } -void tst_QSystemSemaphore::initTestCase() -{ - QVERIFY2(!m_helperBinary.isEmpty(), "Could not find helper binary"); -} - void tst_QSystemSemaphore::init() { existingLock = new QSystemSemaphore(EXISTING_SHARE, 1, QSystemSemaphore::Create); @@ -294,14 +287,6 @@ void tst_QSystemSemaphore::initialValue() #endif } -QString tst_QSystemSemaphore::helperBinary() -{ - QString binary = QStringLiteral("helperbinary"); -#ifdef Q_OS_WIN - binary += QStringLiteral(".exe"); -#endif - return QFINDTESTDATA(binary); -} QTEST_MAIN(tst_QSystemSemaphore) #include "tst_qsystemsemaphore.moc" |