From 86b8daf2a0348be875cbd0b330ab7773f55a35dc Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 15 Jun 2009 13:54:44 +0200 Subject: make qscript unit tests not crash when test files are not found --- .../qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp') 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 -- cgit v1.2.3 From 858c70f768eeb2d65cefd4115f4e9089b588b2d0 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 16 Jun 2009 22:08:09 +1000 Subject: Update license headers as requested by the marketing department. Reviewed-by: Trust Me --- tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp') diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 92027e6bfd..77bfeb5f05 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$ ** ****************************************************************************/ -- cgit v1.2.3 From 9ac5755fb53387a79e5d9c007501800ab9963bed Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 26 Jun 2009 10:41:37 +0200 Subject: make autotests work with shadowbuilds Can't assume that the executable and source are in the same dir. --- tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp') diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 77bfeb5f05..50eb19f23c 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -193,7 +193,7 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a) tst_Suite::tst_Suite() { - testsDir = QDir("."); + testsDir = QDir(SRCDIR); bool testsFound = testsDir.cd("tests"); if (!testsFound) { qWarning("*** no tests/ dir!"); -- cgit v1.2.3