diff options
author | Tobias Koenig <tokoe@kde.org> | 2009-07-05 10:47:45 +0200 |
---|---|---|
committer | Tobias Koenig <tokoe@kde.org> | 2009-07-05 10:47:45 +0200 |
commit | 5db5a9d5d878157a643a441d426ff739084ca031 (patch) | |
tree | d10017bbc11e62e44a7ced7e35de8516964e794a /tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | |
parent | 65c2d095cddfda32052925654dd1defd314ad4b3 (diff) | |
parent | 84bbac2a4d7b663e57b74094cbebf8fca16e0ed8 (diff) | |
download | qt4-tools-5db5a9d5d878157a643a441d426ff739084ca031.tar.gz |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp')
-rw-r--r-- | tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 435af41385..50eb19f23c 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.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$ ** ****************************************************************************/ @@ -193,21 +193,19 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a) tst_Suite::tst_Suite() { - testsDir = QDir("."); - if (!testsDir.cd("tests")) { + testsDir = QDir(SRCDIR); + 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 |