From 71cd5a6f3643a5369b883d0e36478693de6db024 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Fri, 25 Jan 2019 22:48:29 +0100 Subject: Select single-name SSL certificate for test servers using host network MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On Windows and macOS, the containers are deployed into a virtual machine using the host network. All the containers share the same hostname (qt-test-server), and they are connected to the same network domain (local). When running test in such platforms, use the single-name SSL certificate (qt-test-server.local) for SSL related tests. Change-Id: Idf33e01e8dd8814510d848b87b59b5fc0edc903e Reviewed-by: Jędrzej Nowacki --- tests/testserver/common/ssl.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/testserver/common/ssl.sh') diff --git a/tests/testserver/common/ssl.sh b/tests/testserver/common/ssl.sh index 8a4728ad4d..2593a22979 100755 --- a/tests/testserver/common/ssl.sh +++ b/tests/testserver/common/ssl.sh @@ -35,5 +35,6 @@ set -ex # install ssl_certs and test data su $USER -c "mkdir -p -m 700 ~/ssl-certs/private" -su $USER -c "cp $CONFIG/ssl/qt-test-server-cert.pem ~/ssl-certs/" +su $USER -c \ + "cp $CONFIG/ssl/${test_cert:-qt-test-server-cert.pem} ~/ssl-certs/qt-test-server-cert.pem" su $USER -c "cp $CONFIG/ssl/private/qt-test-server-key.pem ~/ssl-certs/private/" -- cgit v1.2.3