AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable Docker-based test servers on macOS temporarily

Browse Source 
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>
This commit is contained in:
Liang Qi 2019-02-05 11:16:58 +01:00
parent a6aacdd560
commit 4c165e6834
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/testserver.pri
View File

@ -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