diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-21 01:06:48 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 16:06:28 +0200 |
| commit | 161d38182694ce35c0b94c712baece42ff4a9d13 (patch) | |
| tree | 451a97a38fef38685167cb1d1e3e264f71ee39d9 /tests/auto | |
| parent | 6137067fc2c746cf064e47767286292ebc3fbf2e (diff) | |
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>
Diffstat (limited to 'tests/auto')
| -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 |