From 74589cde9a81ba60c7bdb582c17b5f144f12c8f1 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 16 Nov 2011 16:15:00 +0100 Subject: [PATCH] Re-enable the integrationtests autotests on Mac OS X The tst_MacNativeEvents, tst_QAccessibility, and tst_QFocusEvent tests currently fail, which will block any changes that attempt to re-enable the autotests. Ignore the failures for now by marking the tests as insignificant. The tst_Lancelot for currently crashes, which can destabilize the CI system when attempting to re-enable the autotests. Skip this test for now by disabling the check target for it. Change-Id: Icc1dc77ebb9b7be746606aae04c9abf2480d0c3f Reviewed-by: Marius Storm-Olsen --- tests/auto/auto.pro | 1 - tests/auto/integrationtests/integrationtests.pro | 1 + tests/auto/integrationtests/macnativeevents/macnativeevents.pro | 1 + tests/auto/integrationtests/qaccessibility/qaccessibility.pro | 2 ++ tests/auto/integrationtests/qfocusevent/qfocusevent.pro | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 248197cb27..31adc92b6f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -24,7 +24,6 @@ cross_compile: SUBDIRS -= tools mac { dbus.CONFIG += no_check_target gui.CONFIG += no_check_target - integrationtests.CONFIG += no_check_target network.CONFIG += no_check_target opengl.CONFIG += no_check_target sql.CONFIG += no_check_target diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro index 053f007b10..df49a12eab 100644 --- a/tests/auto/integrationtests/integrationtests.pro +++ b/tests/auto/integrationtests/integrationtests.pro @@ -34,3 +34,4 @@ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility !linux*-g++*:SUBDIRS -= exceptionsafety_objects +mac: lancelot.CONFIG = no_check_target # QTBUG-22792 diff --git a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro index d52a99dcba..efe091f9f0 100644 --- a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro +++ b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro @@ -15,3 +15,4 @@ SOURCES += expectedeventlist.cpp nativeeventlist.cpp SOURCES += tst_macnativeevents.cpp requires(mac) +CONFIG += insignificant_test # QTBUG-22775 diff --git a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro index d75e1862eb..0019cc94c8 100644 --- a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro +++ b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro @@ -11,3 +11,5 @@ wince*: { accessneeded.path = accessible DEPLOYMENT += accessneeded } + +mac: CONFIG += insignificant_test # QTBUG-22812 diff --git a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro index 5f799291c6..ee2cf22a6a 100644 --- a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro +++ b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_qfocusevent QT += widgets testlib SOURCES += tst_qfocusevent.cpp +mac: CONFIG += insignificant_test # QTBUG-22815