Fixed findtestdata selftest on mac

This test relies on being able to set a custom QLibraryInfo::PrefixPath
for the duration of the test.  However, the test code neglected to
account for the following behavior on mac (from "Using qt.conf"
documentation):

  On Mac OS X, the Prefix is relative to the Contents in the application
  bundle.

Change-Id: Ie9b6d5ebfe8af7d7f332e827069b60a830d6c6f2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Rohan McGovern 2012-01-11 15:40:24 +10:00 committed by Qt by Nokia
parent fa699c8f96
commit d3f6faedb5

View File

@ -62,7 +62,11 @@ void FindTestData::initTestCase()
{
// verify that our qt.conf is working as expected.
QString app_path = QCoreApplication::applicationDirPath();
QString install_path = app_path + "/tests";
QString install_path = app_path
#ifdef Q_OS_MAC
+ "/Contents"
#endif
+ "/tests";
QVERIFY(QDir("/").mkpath(install_path));
QVERIFY(QDir("/").mkpath(install_path + "/findtestdata"));
QCOMPARE(QLibraryInfo::location(QLibraryInfo::TestsPath), install_path);
@ -107,7 +111,11 @@ void FindTestData::paths()
QVERIFY(touch(testfile_path1));
// 2. at the test install path (faked via qt.conf)
QString testfile_path2 = app_path + "/tests/findtestdata/" TESTFILE;
QString testfile_path2 = app_path
#ifdef Q_OS_MAC
+ "/Contents"
#endif
+ "/tests/findtestdata/" TESTFILE;
QVERIFY(touch(testfile_path2));
// 3. at the source path (which we will fake later on)