make qscript unit tests not crash when test files are not found

2 files changed, 18 insertions, 16 deletions

diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index fbb0ba5960..4807b3fe42 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
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 435af41385..92027e6bfd 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -194,20 +194,18 @@ 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;
-    }
-    if (!testsDir.exists("mjsunit.js")) {
-        qWarning("*** no tests/mjsunit.js file!");
-        return;
-    }
-    mjsunitContents = readFile(testsDir.absoluteFilePath("mjsunit.js"));
-    if (mjsunitContents.isEmpty()) {
-        qWarning("*** tests/mjsunit.js is empty!");
-        return;
+    } else {
+        if (!testsDir.exists("mjsunit.js"))
+            qWarning("*** no tests/mjsunit.js file!");
+        else {
+            mjsunitContents = readFile(testsDir.absoluteFilePath("mjsunit.js"));
+            if (mjsunitContents.isEmpty())
+                qWarning("*** tests/mjsunit.js is empty!");
+        }
     }
-
     QString willFixInNextReleaseMessage = QString::fromLatin1("Will fix in next release");
     addExpectedFailure("apply", "morundefineder", "morseper", willFixInNextReleaseMessage);
     addExpectedFailure("arguments-enum", "2", "0", willFixInNextReleaseMessage);
@@ -270,7 +268,9 @@ tst_Suite::tst_Suite()
     appendCString(stringdata, "tst_Suite");
     appendCString(stringdata, "");
 
-    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    QFileInfoList testFileInfos;
+    if (testsFound)
+        testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
     foreach (QFileInfo tfi, testFileInfos) {
         QString name = tfi.baseName();
         // slot: signature, parameters, type, tag, flags