AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTestlib-Selftest: Add initTestCase() setting the directory.

Browse Source 
Required for launching the sub-processes. The test worked only
when launched locally, not from 'make check'.

Change-Id: I42c9202a7726c3135f94445fb336b2b8241535a4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-12-13 17:08:45 +01:00 committed by Qt by Nokia
parent 81d55783bb
commit 92667d14a4
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/testlib/selftests/tst_selftests.cpp
View File

@ -40,14 +40,18 @@
****************************************************************************/
#include <QtCore>
#include <QtTest/QtTest>
#include <QtCore/QXmlStreamReader>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtTest/QtTest>
#include <private/cycle_p.h>
class tst_Selftests: public QObject
{
Q_OBJECT
private slots:
void initTestCase();
void runSubTest_data();
void runSubTest();
void cleanup();
@ -285,6 +289,13 @@ static QList<LoggerSet> allLoggerSets()
;
}
void tst_Selftests::initTestCase()
{
// chdir to our testdata path and execute helper apps relative to that.
QString testdataDir = QFileInfo(QFINDTESTDATA("float")).absolutePath();
QVERIFY2(QDir::setCurrent(testdataDir), qPrintable("Could not chdir to " + testdataDir));
}
void tst_Selftests::runSubTest_data()
{
QTest::addColumn<QString>("subdir");
@ -443,7 +454,9 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
QProcess proc;
static const QProcessEnvironment environment = processEnvironment();
proc.setProcessEnvironment(environment);
proc.start(subdir + QLatin1Char('/') + subdir, arguments);
const QString path = subdir + QLatin1Char('/') + subdir;
proc.start(path, arguments);
QVERIFY2(proc.waitForStarted(), qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, proc.errorString())));
QVERIFY2(proc.waitForFinished(), qPrintable(proc.errorString()));
QList<QByteArray> actualOutputs;