From 68202f646aa9a8d3e695cd76006940f500687b0e Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 2 Jan 2012 12:38:45 +0100 Subject: Make sure tst_QThreadStorage finds its subprocess On Mac, the application's dir is in the bundle, so we need to "escape" the bundle when looking for the an executable relative to the application's dir path. Change-Id: I5c01f7d816ec8cc30f5277202f4eefb0c49a2bc3 Reviewed-by: Rohan McGovern --- tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index 11f2ef5f3f..f5f92d151c 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -290,7 +290,11 @@ void tst_QThreadStorage::crashOnExit() QProcess process; // crashOnExit is always expected to be in the same directory // as this test binary +#ifdef Q_OS_MAC + process.start(QCoreApplication::applicationDirPath() + "/../../../crashOnExit"); +#else process.start(QCoreApplication::applicationDirPath() + "/crashOnExit"); +#endif QVERIFY(process.waitForFinished()); QVERIFY(process.exitStatus() != QProcess::CrashExit); } -- cgit v1.2.3