diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-02 12:38:45 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 12:58:24 +0100 |
| commit | 68202f646aa9a8d3e695cd76006940f500687b0e (patch) | |
| tree | c5b4b9215bdae7bc7b56b7f43466e66812afc78c /tests | |
| parent | 991b91ce57f7a71cc90f3ae4e159b6a23e043af2 (diff) | |
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 <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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); } |