diff options
author | Liang Qi <liang.qi@qt.io> | 2019-02-07 09:13:18 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-07 11:18:48 +0000 |
commit | 17512d497d7eaf01aefe8140f5010818c0103a95 (patch) | |
tree | 32f4b1aee32dcb087cc5955fbd1e6515995ceca4 /tests | |
parent | 5dd09b75cb20119c04ef9179eb537d4f86ec6190 (diff) |
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 <aapo.keskimolo@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/testserver.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 26e7f6ab8a..eb83c6c2cc 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 = "" |