summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-06-15 11:54:44 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-06-15 11:54:44 (GMT)
commit86b8daf2a0348be875cbd0b330ab7773f55a35dc (patch)
tree4e72cd1169b92a6117e654f277b69d5c754cf882 /tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
parentf3b534e5cdbcf7ed1bdd0dc3c258d26a8a3a87ab (diff)
downloadQt-86b8daf2a0348be875cbd0b330ab7773f55a35dc.zip
Qt-86b8daf2a0348be875cbd0b330ab7773f55a35dc.tar.gz
Qt-86b8daf2a0348be875cbd0b330ab7773f55a35dc.tar.bz2
make qscript unit tests not crash when test files are not found
Diffstat (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp')
-rw-r--r--tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 435af41..92027e6 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