diff options
author | Ryan Chu <ryan.chu@qt.io> | 2018-11-30 09:14:54 +0100 |
---|---|---|
committer | Ryan Chu <ryan.chu@qt.io> | 2019-01-23 15:28:51 +0000 |
commit | bcaf67258feb9d0f8590305124c4728f8d195f19 (patch) | |
tree | 31202f4c31b14f546075888b773f2859f1fe5a1f /tests/auto/testserver.pri | |
parent | beab266977c858950bfaa5c2c0d624cb6730f1bc (diff) |
Use environment variables to replace the hard-code value of domain name
Docker compose file supports variable substitution. When running
docker-compose up, Compose looks for the environment variables from
shell and substitutes the values at runtime.
Change-Id: I5255ead82276fac7db24ee74af453f83ca20bbe6
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/testserver.pri')
-rw-r--r-- | tests/auto/testserver.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 735b5d4d90..15ae6228f9 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -100,6 +100,10 @@ isEmpty(TESTSERVER_VERSION) { } else { TESTSERVER_COMPOSE_FILE = $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose.yml DEFINES += QT_TEST_SERVER_NAME + + # The environment variables passed to the docker-compose file + TEST_ENV = 'TEST_DOMAIN=$$DNSDOMAIN' + TEST_CMD = env } # The domain name is relevant to https keycert (qnetworkreply/crts/qt-test-net-cacert.pem). |