From: Miikka Heikkinen Date: Mon, 13 Feb 2012 14:53:24 +0000 (+0200) Subject: Make "nmake check" pass for network tests in Windows. X-Git-Tag: qt-v5.0.0-alpha1~1118 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0fd9b5b06dd8f8c00d67621656b0f591b1f14bc;p=profile%2Fivi%2Fqtbase.git Make "nmake check" pass for network tests in Windows. Marked two tests insignificant due to failures, these need to be fixed later and then re-enabled: - tst_qnetworkreply - tst_qsslsocket Task-number: QTBUG-24203 Change-Id: I9647833bf15fe5a340d7ef59e1dcb007a92677dc Reviewed-by: Sergio Ahumada Reviewed-by: Friedemann Kleint --- diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 1dfd67a..56b8acc 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -28,3 +28,5 @@ wince* { certFiles.path = . DEPLOYMENT += certFiles } + +win32:CONFIG += insignificant_test # QTBUG-24226 diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index a8763d6..bb04e0b 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -35,3 +35,5 @@ wince* { linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC requires(contains(QT_CONFIG,private_tests)) + +win32:CONFIG += insignificant_test # QTBUG-24234