From c2800e75550b1aeea753fbdfe2c6672b5ee931b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 11 Sep 2018 14:31:32 +0300 Subject: Remove insignificant flag from qcolordialog.pro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the test was unstable, we qskip the failing parts instead of mark the whole test insignificant. Task-number: QTBUG-50842 Change-Id: Ib8f5b7ead07d65cc624fa72b190ecee0338c8183 Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro | 2 -- tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro b/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro index c8ddedb401..563db6e887 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro +++ b/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qcolordialog QT += widgets testlib SOURCES += tst_qcolordialog.cpp - -linux*: CONFIG += insignificant_test # Crashes on different Linux distros diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index 0df0544a06..6a0ad4b3a4 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -84,6 +84,9 @@ void tst_QColorDialog::testNativeActiveModalWidget() // Check that QApplication::activeModalWidget retruns the // color dialog when it is executing, even when using a native // dialog: +#if defined(Q_OS_LINUX) + QSKIP("This test crashes sometimes. Although rarely, but it happens. See QTBUG-50842."); +#endif TestNativeDialog d; QTimer::singleShot(1000, &d, SLOT(hide())); d.exec(); @@ -121,6 +124,9 @@ void tst_QColorDialog::testGetRgba() void tst_QColorDialog::defaultOkButton() { +#if defined(Q_OS_LINUX) + QSKIP("This test crashes sometimes. Although rarely, but it happens. See QTBUG-50842."); +#endif QTimer::singleShot(4000, qApp, SLOT(quit())); QTimer::singleShot(0, this, SLOT(testGetRgba())); qApp->exec(); -- cgit v1.2.3