diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-25 19:02:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-09-25 21:06:50 +0000 |
| commit | afb2619d76501b03a7e73fef7c3b0cce80e8e91a (patch) | |
| tree | 7b13810b0dba7d6365aaf1bd7262849e6d906510 /tests | |
| parent | 8d26f701456332427d0d42e342458bc4249aad4f (diff) | |
| parent | a607fcb31e3e1af43bb46ca375ec8378fa0c7d84 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
8 files changed, 30 insertions, 2 deletions
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST index fe1d5bd968..b5b37b4498 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST +++ b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST @@ -1,2 +1,3 @@ [deleteChildrenWithRunningGroup] osx-10.12 +osx-10.13 diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST index 958563d15e..5611969b4d 100644 --- a/tests/auto/corelib/tools/qtimeline/BLACKLIST +++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST @@ -6,3 +6,4 @@ osx-10.13 windows [frameRate] osx-10.12 +osx-10.13 diff --git a/tests/auto/gui/kernel/qguiapplication/BLACKLIST b/tests/auto/gui/kernel/qguiapplication/BLACKLIST new file mode 100644 index 0000000000..9a670237b7 --- /dev/null +++ b/tests/auto/gui/kernel/qguiapplication/BLACKLIST @@ -0,0 +1,4 @@ +[focusObject] +opensuse +opensuse-leap +ubuntu 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(); diff --git a/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST b/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST new file mode 100644 index 0000000000..4833af527f --- /dev/null +++ b/tests/auto/widgets/effects/qgraphicseffect/BLACKLIST @@ -0,0 +1,3 @@ +[prepareGeometryChangeInvalidateCache] +opensuse +opensuse-leap diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST index 70170d2822..0e7a1b451f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST @@ -3,3 +3,15 @@ osx-10.11 ci [isActive] opensuse-42.3 ci +[removeFullyTransparentItem] +osx-10.11 +osx-10.12 +[tabFocus_sceneWithNestedFocusWidgets] +opensuse +opensuse-leap +[inputMethod] +opensuse +opensuse-leap +[hoverEvents_parentChild] +ubuntu + diff --git a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST new file mode 100644 index 0000000000..efb813f7d2 --- /dev/null +++ b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST @@ -0,0 +1,3 @@ +[stretchAndRestoreLastSection] +opensuse +opensuse-leap |