summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsslsocket_onDemandCertificates_member
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-12-29 09:25:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-12-29 09:25:51 (GMT)
commitf80d04ea96a52090e939a53779aa04d4bd174f24 (patch)
treeca54caec0d7891bafdfe4813036db5f3dcca7f61 /tests/auto/qsslsocket_onDemandCertificates_member
parent8c94ee1f77f665d80a0590e7dd003e8089ff353f (diff)
parent12cb4aac35904a493cb0d34f6d7767955aad84fe (diff)
downloadQt-f80d04ea96a52090e939a53779aa04d4bd174f24.zip
Qt-f80d04ea96a52090e939a53779aa04d4bd174f24.tar.gz
Qt-f80d04ea96a52090e939a53779aa04d4bd174f24.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Diffstat (limited to 'tests/auto/qsslsocket_onDemandCertificates_member')
-rw-r--r--tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 0c26ee5..6bed9ff 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -26,3 +26,5 @@ wince* {
}
requires(contains(QT_CONFIG,private_tests))
+
+CONFIG+=insignificant_test # QTQAINFRA-428