1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testlib: fix the last few s/Q_OS_MAC/Q_OS_DARWIN/w

Browse Source 
Change-Id: I6fe6a865aea37c6a2d153bd2c3aace5242362c88
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
This commit is contained in:
Edward Welbourne 2023-03-17 17:56:44 +01:00
parent 656729c5b6
commit 9896ebf93d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtestcase.cpp
View File

@ -707,7 +707,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
QTest::testFunctions.clear(); QTest::testFunctions.clear();
QTest::testTags.clear(); QTest::testTags.clear();
#if defined(Q_OS_MAC) && defined(HAVE_XCTEST) #if defined(Q_OS_DARWIN) && defined(HAVE_XCTEST)
if (QXcodeTestLogger::canLogTestProgress()) if (QXcodeTestLogger::canLogTestProgress())
logFormat = QTestLog::XCTest; logFormat = QTestLog::XCTest;
#endif #endif

4
tests/auto/testlib/selftests/findtestdata/findtestdata.cpp
View File

@ -26,7 +26,7 @@ void FindTestData::initTestCase()
// verify that our qt.conf is working as expected. // verify that our qt.conf is working as expected.
QString app_path = QCoreApplication::applicationDirPath(); QString app_path = QCoreApplication::applicationDirPath();
QString install_path = app_path QString install_path = app_path
#ifdef Q_OS_MAC #ifdef Q_OS_DARWIN
+ "/Contents" + "/Contents"
#endif #endif
+ "/tests"; + "/tests";
@ -75,7 +75,7 @@ void FindTestData::paths()
// 2. at the test install path (faked via qt.conf) // 2. at the test install path (faked via qt.conf)
QString testfile_path2 = app_path QString testfile_path2 = app_path
#ifdef Q_OS_MAC #ifdef Q_OS_DARWIN
+ "/Contents" + "/Contents"
#endif #endif
+ "/tests/findtestdata/" TESTFILE; + "/tests/findtestdata/" TESTFILE;