diff options
| -rw-r--r-- | tests/auto/auto.pro | 9 | ||||
| -rw-r--r-- | tests/auto/network/network.pro | 6 | ||||
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/qsslsocket.pro | 2 |
4 files changed, 6 insertions, 13 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index bd69fa17fa..81d144dd03 100644 --- 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 2048d14dc8..64262a8632 100644 --- 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 4daa9963ce..ce54ef5a1c 100644 --- 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 bb04e0b9c4..70b495b8ae 100644 --- 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 |