diff options
Diffstat (limited to 'tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp')
| -rw-r--r-- | tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index fbb0ba5..4807b3f 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -390,9 +390,9 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a) tst_Suite::tst_Suite() { testsDir = QDir("."); - if (!testsDir.cd("tests")) { + bool testsFound = testsDir.cd("tests"); + if (!testsFound) { qWarning("*** no tests/ dir!"); - return; } QString willFixInNextReleaseMessage = QString::fromLatin1("Will fix in next release"); @@ -802,7 +802,9 @@ tst_Suite::tst_Suite() // don't execute any tests on slow machines #if !defined(Q_OS_IRIX) // do all the test suites - QFileInfoList testSuiteDirInfos = testsDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + QFileInfoList testSuiteDirInfos; + if (testsFound) + testSuiteDirInfos = testsDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); foreach (QFileInfo tsdi, testSuiteDirInfos) { QDir testSuiteDir(tsdi.absoluteFilePath()); // do all the dirs in the test suite |