diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-07 23:23:28 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-07 23:25:27 (GMT) |
| commit | 2350298a3ba43a61f2e88bbd85c38b046269c6b5 (patch) | |
| tree | 2cf5b2e94c6efbd7fcf860285909e3340708a92c /tests/auto/maketestselftest | |
| parent | d3527d779b784ad89285bcb8790504354d9dd3ae (diff) | |
| download | Qt-2350298a3ba43a61f2e88bbd85c38b046269c6b5.zip Qt-2350298a3ba43a61f2e88bbd85c38b046269c6b5.tar.gz Qt-2350298a3ba43a61f2e88bbd85c38b046269c6b5.tar.bz2 | |
Disabled tst_MakeTestSelfTest::make_check by default on mac.
This test is too slow on our macs too.
It's now disabled by default everywhere but Linux.
Diffstat (limited to 'tests/auto/maketestselftest')
| -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 |