diff options
| author | aavit <qt-info@nokia.com> | 2010-09-08 15:20:08 +0200 |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-09-08 15:20:08 +0200 |
| commit | 4d89a1dc2ea1f1dfbb6109d940496e924185fe13 (patch) | |
| tree | 4dde112b06cbfd2204312ed920386eceff9a4569 /tests/auto/lancelot | |
| parent | f95b6a469907294bcf1a1f6bd6271cef19939bd1 (diff) | |
Opened for running on Mac too
Diffstat (limited to 'tests/auto/lancelot')
| -rw-r--r-- | tests/auto/lancelot/tst_lancelot.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp index aba544fb5c..4792aa53ef 100644 --- a/tests/auto/lancelot/tst_lancelot.cpp +++ b/tests/auto/lancelot/tst_lancelot.cpp @@ -100,8 +100,8 @@ void tst_Lancelot::initTestCase() // (e.g. script files not found) as just warnings, and not QFAILs, to avoid false negatives // caused by environment or server instability -#if !defined(Q_OS_LINUX) - QSKIP("For the moment, this test is only supported on Linux.", SkipAll); +#if !defined(Q_OS_LINUX) && !defined(Q_OS_MAC) + QSKIP("For the moment, this test is only supported on Linux & Mac.", SkipAll); #endif if (!proto.connect()) { QWARN(qPrintable(proto.errorMessage())); @@ -169,6 +169,9 @@ void tst_Lancelot::testRasterRGB16() void tst_Lancelot::testOpenGL_data() { +#if defined(Q_OS_MAC) + QSKIP("OpenGL testing not supported on this platform.", SkipAll); +#endif QStringList localBlacklist = QStringList() << QLatin1String("sizes.qps") << QLatin1String("rasterops.qps"); if (!setupTestSuite(ImageItem::OpenGL, QImage::Format_RGB32, localBlacklist)) QSKIP("Communication with baseline image server failed.", SkipAll); |