diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-10-07 06:49:30 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-10-07 06:49:30 (GMT) |
| commit | eae8c143428128a4bea4c06cff93b38189da267d (patch) | |
| tree | fb66e5548b28d990b22d7cd6b69e3c75d6a3907c | |
| parent | 83b4cad278e2c3b0ca16affc76a82ddce9d6149a (diff) | |
| download | Qt-eae8c143428128a4bea4c06cff93b38189da267d.zip Qt-eae8c143428128a4bea4c06cff93b38189da267d.tar.gz Qt-eae8c143428128a4bea4c06cff93b38189da267d.tar.bz2 | |
Fix failure on Windows after commit ccd3f66
By default the builds are placed in either a release\ or debug\
directory, so we need to start the correct one on Windows.
Reviewed-by: trustme
| -rw-r--r-- | tests/auto/qthreadstorage/tst_qthreadstorage.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp index 097d729..ed86165 100644 --- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp @@ -297,7 +297,15 @@ void tst_QThreadStorage::ensureCleanupOrder() void tst_QThreadStorage::QTBUG13877_crashOnExit() { QProcess process; +#ifdef Q_OS_WIN +# ifdef QT_NO_DEBUG + process.start("release/crashOnExit"); +# else + process.start("debug/crashOnExit"); +# endif +#else process.start("./crashOnExit"); +#endif QVERIFY(process.waitForFinished()); QVERIFY(process.exitStatus() != QProcess::CrashExit); } |