summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-06-25 17:43:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-06-25 23:32:50 +0200
commitafdce18f576adfb68eb381d1864e50580ed08786 (patch)
tree77f490a9939b08b09a346c2852475c7d45cf726b
parentdf151d21b6e83144a54f8ee7d622b6dda815ddc5 (diff)
QSKIP test that is blocking unrelated changes in CI
The test looks vulnerable to misbehaviour if the working directory contains unexpected files and folders. As it's already skipped on Mac, skip on linux as well to unblock the CI. Change-Id: Id2e48ea455eb77e36c4f9d899885e101f674c0a3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 009acb0a4a..1bf9409584 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -494,8 +494,8 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog()
void tst_QFileDialog2::task227930_correctNavigationKeyboardBehavior()
{
-#ifdef Q_OS_MAC
- QSKIP("This test currently fails on Mac OS X, see QTBUG-23602");
+#if defined (Q_OS_MAC) || defined (Q_OS_LINUX)
+ QSKIP("This test currently fails on Mac OS X and linux CI, see QTBUG-23602");
#endif
QDir current = QDir::currentPath();
current.mkdir("test");