Re-enable network tests on Mac OS.

Switch on most of the tests (all but the bearer tests), marking the two
known failures as insignificant tests.

Change-Id: I17f228a938de1a23eddf897f494bfa4e54338dae
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index bd69fa1..81d144d 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -20,11 +20,4 @@ cross_compile:                              SUBDIRS -= tools
 !contains(QT_CONFIG, opengl):               SUBDIRS -= opengl
 !unix|embedded|!contains(QT_CONFIG, dbus):  SUBDIRS -= dbus
 contains(QT_CONFIG, no-widgets):            SUBDIRS -= widgets
-
-# disable 'make check' on Mac OS X for the following subdirs for the time being
-mac {
-    network.CONFIG += no_check_target
-}
-
-!contains(QT_CONFIG, concurrent): SUBDIRS -= concurrent
-
+!contains(QT_CONFIG, concurrent):           SUBDIRS -= concurrent

diff --git a/tests/auto/network/network.pro b/tests/auto/network/network.pro
index 2048d14..64262a8 100644 (file)
--- a/tests/auto/network/network.pro
+++ b/tests/auto/network/network.pro
@@ -6,7 +6,5 @@ SUBDIRS=\
    ssl \
    socket \
 
-win32 {
-    socket.CONFIG += no_check_target      # QTBUG-24451 - all socket tests require waitForX
-    bearer.CONFIG += no_check_target      # QTBUG-24503 - these tests fail if machine has a WLAN adaptor
-}
+win32:    socket.CONFIG += no_check_target      # QTBUG-24451 - all socket tests require waitForX
+win32|mac:bearer.CONFIG += no_check_target      # QTBUG-24503 - these tests fail if machine has a WLAN adaptor

diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 4daa996..ce54ef5 100644 (file)
--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -25,3 +25,5 @@ win32 {
 QT = core network testlib
 
 MOC_DIR=tmp
+
+mac:CONFIG+=insignificant_test # QTBUG-25445

diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index bb04e0b..70b495b 100644 (file)
--- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
@@ -36,4 +36,4 @@ linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+
 
 requires(contains(QT_CONFIG,private_tests))
 
-win32:CONFIG += insignificant_test # QTBUG-24234
+win32|mac:CONFIG += insignificant_test # QTBUG-24234