summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp')
-rw-r--r--tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index fbb0ba5960..66004f86d6 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -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