diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-16 14:34:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 16:06:15 +0100 |
| commit | f3fc2078b895e257af0c0e88eec92da620b6094f (patch) | |
| tree | 863a655432d55097fdd8d98547b9f7366a2d27a4 /tests/auto/corelib/kernel/qsharedmemory | |
| parent | e778042ed7dc5c12aeea0dfcd5401bc9d002dc53 (diff) | |
Check existence of QProcess feature before using it on Qt autotests.
VxWorks does not have QProcess support.
Change-Id: I917b769f967e9d71ec5025aae788f3e237b07aeb
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from commit 416e73a0fcaf31f7c32ba7dcd214b62e6060123c)
Diffstat (limited to 'tests/auto/corelib/kernel/qsharedmemory')
| -rw-r--r-- | tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp index daf8c31772..02f99b08d3 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp @@ -82,7 +82,7 @@ private slots: void removeWhileAttached(); #endif void emptyMemory(); -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) && !defined(QT_NO_PROCESS) void readOnly(); #endif @@ -98,8 +98,10 @@ private slots: void simpleThreadedProducerConsumer(); // with processes +#ifndef QT_NO_PROCESS void simpleProcessProducerConsumer_data(); void simpleProcessProducerConsumer(); +#endif // extreme cases void useTooMuchMemory(); @@ -447,7 +449,7 @@ void tst_QSharedMemory::emptyMemory() by writing to data and causing a segfault. */ // This test opens a crash dialog on Windows. -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) && !defined(QT_NO_PROCESS) void tst_QSharedMemory::readOnly() { rememberKey("readonly_segfault"); @@ -728,6 +730,7 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer() } } +#ifndef QT_NO_PROCESS void tst_QSharedMemory::simpleProcessProducerConsumer_data() { QTest::addColumn<int>("processes"); @@ -785,6 +788,7 @@ void tst_QSharedMemory::simpleProcessProducerConsumer() producer.waitForBytesWritten(); QVERIFY(producer.waitForFinished(5000)); } +#endif void tst_QSharedMemory::uniqueKey_data() { |