From 17512d497d7eaf01aefe8140f5010818c0103a95 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 7 Feb 2019 09:13:18 +0100 Subject: [PATCH] Disable Docker-based test servers on Windows temporarily The coin agent starts to crash after the docker-compose call. Need to have qt5 dev integrated first, then fix the real issue later. Task-number: QTQAINFRA-2717 Task-number: QTQAINFRA-2750 Change-Id: I255c0c10466cc9413ca41c756ebdb7c049511507 Reviewed-by: Aapo Keskimolo --- tests/auto/testserver.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 26e7f6ab8a4..eb83c6c2cc6 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -58,9 +58,9 @@ debug_and_release:!build_pass: return() DOCKER_ENABLED = 1 -equals(QMAKE_HOST.os, Darwin) { +equals(QMAKE_HOST.os, Darwin) | equals(QMAKE_HOST.os, Windows) { DOCKER_ENABLED = 0 - message("Not using docker network test server on macOS, see QTQAINFRA-2717 and QTQAINFRA-2750") + message("Not using docker network test server on macOS and Windows, see QTQAINFRA-2717 and QTQAINFRA-2750") } TESTSERVER_VERSION = ""