AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable network tests on Mac OS.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2012-04-21 01:06:48 +10:00 committed by Qt by Nokia
parent 6137067fc2
commit 161d381826
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/auto.pro
View File

@ -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

6
tests/auto/network/network.pro
View File

@ -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

2
tests/auto/network/socket/qtcpserver/test/test.pro
View File

@ -25,3 +25,5 @@ win32 {
QT = core network testlib
MOC_DIR=tmp
mac:CONFIG+=insignificant_test # QTBUG-25445

2
tests/auto/network/ssl/qsslsocket/qsslsocket.pro
View File

@ -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