diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-05 11:16:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-06 22:04:54 +0000 |
| commit | 4c165e68342b7de32bbbb49fe103c1eb7f575696 (patch) | |
| tree | 8319b85ac104e6978fb823ec0599c388373c8aa9 /tests | |
| parent | a6aacdd5607437f13866aff7e0869a7c5f508f00 (diff) | |
Disable Docker-based test servers on macOS temporarily
The coin agent starts to crash after the docker-compose call.
Need to have qt5 5.13 integrated first, then fix the real issue later.
Task-number: QTQAINFRA-2717
Task-number: QTQAINFRA-2750
Change-Id: I3dcd963b1c5cea0b2197f1589398d8a9ed18f46f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testserver.pri | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 73008ea8b3..26e7f6ab8a 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -56,7 +56,18 @@ # Makefile.Debug and Makefile.Release. debug_and_release:!build_pass: return() -TESTSERVER_VERSION = $$system(docker-compose --version) +DOCKER_ENABLED = 1 + +equals(QMAKE_HOST.os, Darwin) { + DOCKER_ENABLED = 0 + message("Not using docker network test server on macOS, see QTQAINFRA-2717 and QTQAINFRA-2750") +} + +TESTSERVER_VERSION = "" + +equals(DOCKER_ENABLED, 1) { + TESTSERVER_VERSION = $$system(docker-compose --version) +} isEmpty(TESTSERVER_VERSION) { # Make check with server "qt-test-server.qt-test-net" as a fallback |