diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-01 14:04:01 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-02 18:51:29 +0100 |
| commit | 006c5a7d733437be021037fca6142b005dda4c4c (patch) | |
| tree | 1cbd42a1a42d338081a5523f564fbd83e19aa051 /tests/auto | |
| parent | b9f0bde16e85161666d5090952955bebacc40f89 (diff) | |
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 <holger.ihrig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro (renamed from tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp (renamed from tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp) | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro (renamed from tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp (renamed from tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp) | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/ssl.pro | 5 |
5 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 33b55b4638..33b55b4638 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/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 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<QSslSocket> diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index 8a500a3d99..8a500a3d99 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/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 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<QSslSocket> 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 \ |