From 006c5a7d733437be021037fca6142b005dda4c4c Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Tue, 1 Nov 2011 14:04:01 +0100 Subject: [PATCH] Moved tests into network/ssl/ This commit moves qsslsocket_onDemandCertificates_member and qsslsocket_onDemandCertificates_static from tests/auto/ to tests/auto/network/ssl/. Change-Id: I1593e113016ce7bb7dffbee82f1196275784d0ac Reviewed-by: Holger Ihrig Reviewed-by: Jason McDonald --- .../qsslsocket_onDemandCertificates_member.pro | 0 .../tst_qsslsocket_onDemandCertificates_member.cpp | 2 +- .../qsslsocket_onDemandCertificates_static.pro | 0 .../tst_qsslsocket_onDemandCertificates_static.cpp | 2 +- tests/auto/network/ssl/ssl.pro | 5 +++-- 5 files changed, 5 insertions(+), 4 deletions(-) rename tests/auto/{ => network/ssl}/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro (100%) rename tests/auto/{ => network/ssl}/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp (99%) rename tests/auto/{ => network/ssl}/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro (100%) rename tests/auto/{ => network/ssl}/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp (99%) diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro similarity index 100% rename from tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro rename to tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp similarity index 99% rename from tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp rename to tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp index 2f4be28b38..881ec36d4c 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp @@ -48,7 +48,7 @@ #include "private/qhostinfo_p.h" -#include "../network-settings.h" +#include "../../../network-settings.h" #ifndef QT_NO_OPENSSL class QSslSocketPtr: public QSharedPointer diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro similarity index 100% rename from tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro rename to tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp similarity index 99% rename from tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp rename to tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp index 16dea56c97..bbbfb3e6b9 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp @@ -48,7 +48,7 @@ #include "private/qhostinfo_p.h" -#include "../network-settings.h" +#include "../../../network-settings.h" #ifndef QT_NO_OPENSSL class QSslSocketPtr: public QSharedPointer diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index fd57a1729b..dd92ec0358 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -3,6 +3,7 @@ SUBDIRS=\ qsslcertificate \ qsslcipher \ qsslerror \ - qsslsocket \ qsslkey \ - + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \