Fix tests for platforms without process support
Change-Id: I2d1cefdb5ff574635a75b54499efc392aba84434 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
parent
495e8c2054
commit
cb6d751efa
@ -279,8 +279,10 @@ static void playWithObjects()
|
|||||||
|
|
||||||
void tst_QObject::initTestCase()
|
void tst_QObject::initTestCase()
|
||||||
{
|
{
|
||||||
|
#ifndef QT_NO_PROCESS
|
||||||
const QString testDataDir = QFileInfo(QFINDTESTDATA("signalbug")).absolutePath();
|
const QString testDataDir = QFileInfo(QFINDTESTDATA("signalbug")).absolutePath();
|
||||||
QVERIFY2(QDir::setCurrent(testDataDir), qPrintable("Could not chdir to " + testDataDir));
|
QVERIFY2(QDir::setCurrent(testDataDir), qPrintable("Could not chdir to " + testDataDir));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QObject::disconnect()
|
void tst_QObject::disconnect()
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
|
|
||||||
SUBDIRS = sharedmemoryhelper test
|
!winrt: SUBDIRS = sharedmemoryhelper
|
||||||
|
|
||||||
|
SUBDIRS += test
|
||||||
|
@ -138,7 +138,9 @@ tst_QSharedMemory::~tst_QSharedMemory()
|
|||||||
|
|
||||||
void tst_QSharedMemory::initTestCase()
|
void tst_QSharedMemory::initTestCase()
|
||||||
{
|
{
|
||||||
|
#ifndef QT_NO_PROCESS
|
||||||
QVERIFY2(!m_helperBinary.isEmpty(), "Could not find helper binary");
|
QVERIFY2(!m_helperBinary.isEmpty(), "Could not find helper binary");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QSharedMemory::init()
|
void tst_QSharedMemory::init()
|
||||||
|
Loading…
Reference in New Issue
Block a user