diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 04:36:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 04:36:17 (GMT) |
| commit | dfd7c876263310c03d8b64033749efe2b6b1e081 (patch) | |
| tree | bd71f8e8697ac38954476804d329c46f69cb8545 | |
| parent | 7d92a635bc21ae64071854f460098deeceb6c199 (diff) | |
| parent | 2350298a3ba43a61f2e88bbd85c38b046269c6b5 (diff) | |
| download | Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.zip Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.tar.gz Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Disabled tst_MakeTestSelfTest::make_check by default on mac.
| -rw-r--r-- | tests/auto/maketestselftest/tst_maketestselftest.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index 3d1bbed..a9077e3 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -457,10 +457,13 @@ void tst_MakeTestSelfTest::make_check() QString testsDir(SRCDIR "/.."); QString checktest(SRCDIR "/checktest/checktest"); -#ifdef Q_OS_WIN32 +#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) if (qgetenv("RUN_SLOW_TESTS").isEmpty()) { - QSKIP("This test is too slow to run by default on Windows. Set RUN_SLOW_TESTS=1 to run it.", SkipAll); + QSKIP("This test is too slow to run by default on this OS. Set RUN_SLOW_TESTS=1 to run it.", SkipAll); } +#endif + +#ifdef Q_OS_WIN32 checktest.replace("/", "\\"); checktest += ".exe"; #endif |