1 files changed, 13 insertions, 3 deletions

diff --git a/mkspecs/features/unsupported/testserver.prf b/mkspecs/features/unsupported/testserver.prf
index 6507a360c5..32bd4df30c 100644
--- a/mkspecs/features/unsupported/testserver.prf
+++ b/mkspecs/features/unsupported/testserver.prf
@@ -94,29 +94,33 @@ isEmpty(TESTSERVER_VERSION) {
         # binds the same port on the host. An alternative solution is to deploy
         # the docker environment into VirtualBox using docker-machine.
         isEmpty(TESTSERVER_COMPOSE_FILE): TESTSERVER_COMPOSE_FILE = \
-            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose-for-macOS.yml
+            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose-host-network.yml
 
         # The connection configuration for the target machine
         MACHINE_CONFIG = $(shell docker-machine config qt-test-server)
 
         # The environment variables passed to the docker-compose file
         TEST_ENV = 'MACHINE_IP=$(shell docker-machine ip qt-test-server)'
+        TEST_ENV += 'HOST_NAME=qt-test-server'
         TEST_ENV += 'TEST_DOMAIN=$$DNSDOMAIN'
         TEST_ENV += 'SHARED_DATA=$$PWD/../data/testserver'
+        TEST_ENV += 'SHARED_SERVICE=host-network'
         TEST_CMD = env
     } else:equals(QMAKE_HOST.os, Windows) {
         # There is no docker bridge on Windows. It is impossible to ping a container.
         # Use docker-machine to deploy the docker environment into VirtualBox.
         isEmpty(TESTSERVER_COMPOSE_FILE): TESTSERVER_COMPOSE_FILE = \
-            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose-for-windows.yml
+            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose-host-network.yml
 
         # The connection configuration for the target machine
         MACHINE_CONFIG = (docker-machine config qt-test-server)
 
         # The environment variables passed to the docker-compose file
         TEST_ENV = '\$\$env:MACHINE_IP = docker-machine ip qt-test-server;'
+        TEST_ENV += '\$\$env:HOST_NAME = $$shell_quote(\"qt-test-server\");'
         TEST_ENV += '\$\$env:TEST_DOMAIN = $$shell_quote(\"$$DNSDOMAIN\");'
         TEST_ENV += '\$\$env:SHARED_DATA = $$shell_quote(\"$$PWD/../data/testserver\");'
+        TEST_ENV += '\$\$env:SHARED_SERVICE = $$shell_quote(\"host-network\");'
 
         # Docker-compose CLI environment variables:
         # Enable path conversion from Windows-style to Unix-style in volume definitions.
@@ -126,12 +130,18 @@ isEmpty(TESTSERVER_VERSION) {
         CONFIG += PowerShell
     } else {
         isEmpty(TESTSERVER_COMPOSE_FILE): TESTSERVER_COMPOSE_FILE = \
-            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose.yml
+            $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose-bridge-network.yml
         # The environment variables passed to the docker-compose file
         TEST_ENV = 'TEST_DOMAIN=$$DNSDOMAIN'
         TEST_ENV += 'SHARED_DATA=$$PWD/../data/testserver'
+        TEST_ENV += 'SHARED_SERVICE=bridge-network'
         TEST_CMD = env
     }
+
+    # If $$TESTSERVER_COMPOSE_FILE defined by platform doesn't exist, the default
+    # docker-compose.yml is used as a fallback.
+    !exists($$TESTSERVER_COMPOSE_FILE): TESTSERVER_COMPOSE_FILE = \
+        $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose.yml
     !exists($$TESTSERVER_COMPOSE_FILE): error("Invalid TESTSERVER_COMPOSE_FILE specified")