From 77ddb00a49fdde54df2b232e9e901a08e48cee6d Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Wed, 4 Jan 2012 12:28:20 +1000 Subject: Changed tests: qmake,selftest and lancelot to use QFINDTESTDATA. Changed these tests to use QFINDTESTDATA macro to detect location of testdata. Checking for a specific file contained in the testdata so as not to be confused by empty directories created during configure. Change-Id: Iac2ac6304b6b9ac79e00886025b93ec0af5a8507 Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/auto/testlib/selftests/tst_selftests.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests/auto/testlib/selftests') diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index cb03611af3..e8c4806794 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -291,8 +291,17 @@ static QList allLoggerSets() void tst_Selftests::initTestCase() { + //Detect the location of the sub programs + QString subProgram = QLatin1String("float/float"); +#if defined(Q_OS_WIN) + subProgram = QLatin1String("float/float.exe"); +#endif + QString testdataDir = QFINDTESTDATA(subProgram); + if (testdataDir.lastIndexOf(subProgram) > 0) + testdataDir = testdataDir.left(testdataDir.lastIndexOf(subProgram)); + else + testdataDir = QCoreApplication::applicationDirPath(); // 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)); } -- cgit v1.2.3