summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-03-13 15:27:44 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-13 16:16:58 (GMT)
commit29b34708469d3b5ce08c4d724e047a395a10caac (patch)
tree08d0d740c34cbe29e346b9192e4d9263a72bd9a0
parentb5975e20c3760adc3032e87c1fb68253bbdbfea9 (diff)
downloadQt-29b34708469d3b5ce08c4d724e047a395a10caac.zip
Qt-29b34708469d3b5ce08c4d724e047a395a10caac.tar.gz
Qt-29b34708469d3b5ce08c4d724e047a395a10caac.tar.bz2
tests: Mark tst_qdbus* tests as insignificant on OS X
D-Bus libraries were recently added to OS X 10.7 making these tests to be executed for first time. Task-number: QTBUG-37469 (cherry-picked from qtbase commit 9f87c3663d49a0a4c5affe6119ce399a6d0f5e7a) Change-Id: I7886614bcaab290c3d4fef94d93ee9ad7837a3ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--tests/auto/qdbusabstractadaptor/test/test.pro2
-rw-r--r--tests/auto/qdbusabstractinterface/test/test.pro2
-rw-r--r--tests/auto/qdbusconnection/qdbusconnection.pro2
-rw-r--r--tests/auto/qdbuscontext/qdbuscontext.pro2
-rw-r--r--tests/auto/qdbusinterface/test/test.pro2
-rw-r--r--tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro2
-rw-r--r--tests/auto/qdbusmarshall/test/test.pro2
-rw-r--r--tests/auto/qdbusmetaobject/qdbusmetaobject.pro2
-rw-r--r--tests/auto/qdbusmetatype/qdbusmetatype.pro2
-rw-r--r--tests/auto/qdbuspendingcall/qdbuspendingcall.pro2
-rw-r--r--tests/auto/qdbuspendingreply/qdbuspendingreply.pro2
-rw-r--r--tests/auto/qdbusreply/qdbusreply.pro2
-rw-r--r--tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro2
-rw-r--r--tests/auto/qdbusthreading/qdbusthreading.pro2
14 files changed, 21 insertions, 7 deletions
diff --git a/tests/auto/qdbusabstractadaptor/test/test.pro b/tests/auto/qdbusabstractadaptor/test/test.pro
index 014a9e8..39167e1 100644
--- a/tests/auto/qdbusabstractadaptor/test/test.pro
+++ b/tests/auto/qdbusabstractadaptor/test/test.pro
@@ -5,3 +5,5 @@ TARGET = ../tst_qdbusabstractadaptor
QT = core
QT += dbus
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusabstractinterface/test/test.pro b/tests/auto/qdbusabstractinterface/test/test.pro
index aba7f57..64a84b2 100644
--- a/tests/auto/qdbusabstractinterface/test/test.pro
+++ b/tests/auto/qdbusabstractinterface/test/test.pro
@@ -11,3 +11,5 @@ TARGET = ../tst_qdbusabstractinterface
QT = core testlib
QT += dbus
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusconnection/qdbusconnection.pro b/tests/auto/qdbusconnection/qdbusconnection.pro
index d33ab0d..8732a02 100644
--- a/tests/auto/qdbusconnection/qdbusconnection.pro
+++ b/tests/auto/qdbusconnection/qdbusconnection.pro
@@ -8,4 +8,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbuscontext/qdbuscontext.pro b/tests/auto/qdbuscontext/qdbuscontext.pro
index ddd340c..796d3bf 100644
--- a/tests/auto/qdbuscontext/qdbuscontext.pro
+++ b/tests/auto/qdbuscontext/qdbuscontext.pro
@@ -8,4 +8,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusinterface/test/test.pro b/tests/auto/qdbusinterface/test/test.pro
index 3252188..a0dac5f 100644
--- a/tests/auto/qdbusinterface/test/test.pro
+++ b/tests/auto/qdbusinterface/test/test.pro
@@ -5,3 +5,5 @@ TARGET = ../tst_qdbusinterface
QT = core
QT += dbus
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro b/tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro
index cef3ddc..cfe84c0 100644
--- a/tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro
+++ b/tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro
@@ -8,4 +8,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro
index 71fc656..ea34fec 100644
--- a/tests/auto/qdbusmarshall/test/test.pro
+++ b/tests/auto/qdbusmarshall/test/test.pro
@@ -7,3 +7,5 @@ QT += dbus
LIBS += $$QT_LIBS_DBUS
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
index c7b5eac..5b90e53 100644
--- a/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
+++ b/tests/auto/qdbusmetaobject/qdbusmetaobject.pro
@@ -7,4 +7,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusmetatype/qdbusmetatype.pro b/tests/auto/qdbusmetatype/qdbusmetatype.pro
index da8fbec..7670a74 100644
--- a/tests/auto/qdbusmetatype/qdbusmetatype.pro
+++ b/tests/auto/qdbusmetatype/qdbusmetatype.pro
@@ -7,4 +7,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
index b4b3cfc..b01313e 100644
--- a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
+++ b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
@@ -2,3 +2,5 @@ load(qttest_p4)
requires(contains(QT_CONFIG, dbus))
QT = core dbus
SOURCES += tst_qdbuspendingcall.cpp
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
index c649e4a..03d0139 100644
--- a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
+++ b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
@@ -2,3 +2,5 @@ load(qttest_p4)
requires(contains(QT_CONFIG, dbus))
QT = core dbus
SOURCES += tst_qdbuspendingreply.cpp
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusreply/qdbusreply.pro b/tests/auto/qdbusreply/qdbusreply.pro
index c96116c..59c92c2 100644
--- a/tests/auto/qdbusreply/qdbusreply.pro
+++ b/tests/auto/qdbusreply/qdbusreply.pro
@@ -7,4 +7,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
index 0a325c9..87b5909 100644
--- a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
+++ b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
@@ -7,3 +7,5 @@ contains(QT_CONFIG,dbus): {
} else {
SOURCES += ../qdbusmarshall/dummy.cpp
}
+
+macx:CONFIG += insignificant_test # QTBUG-37469
diff --git a/tests/auto/qdbusthreading/qdbusthreading.pro b/tests/auto/qdbusthreading/qdbusthreading.pro
index e239e98..dd9a84a 100644
--- a/tests/auto/qdbusthreading/qdbusthreading.pro
+++ b/tests/auto/qdbusthreading/qdbusthreading.pro
@@ -8,4 +8,4 @@ contains(QT_CONFIG,dbus): {
SOURCES += ../qdbusmarshall/dummy.cpp
}
-
+macx:CONFIG += insignificant_test # QTBUG-37469