diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2018-07-31 19:18:06 +0200 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2018-08-03 19:25:29 +0000 |
| commit | 0eb1574b28ced49cc0134c557a1744d4af0f84e6 (patch) | |
| tree | d598e1b1815f1106bb85af0ca24218be0b8bf50f /tests | |
| parent | 3014e2bf01ab256531f71dc97efcdaec07cd23cc (diff) | |
Disable Docker-based test servers on QEMU devices temporarily
Before libnss-mdns package is added to boot2qt dependency, the QEMU
devices should keep using the remote test server. There are two Linux
QEMU devices using 'linux-generic-g++' and 'linux-lmx7-g++' target
mkspec.
Relates to yocto/meta-boot2qt (Change-Id: I480f45)
Change-Id: I7870d3a184109e0abf712b4513148cf9a4520189
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testserver.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 2adf85a044..125d7f0bc6 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -55,7 +55,7 @@ TESTSERVER_COMPOSE_FILE = $$dirname(_QMAKE_CONF_)/tests/testserver/docker-compos TESTSERVER_VERSION = $$system(docker-compose --version) TESTSERVER_IMAGES = $$system(docker images -aq "qt-test-server-*") -equals(QMAKE_HOST.os, Windows)|isEmpty(TESTSERVER_VERSION) { +equals(QMAKE_HOST.os, Windows)|isEmpty(TESTSERVER_VERSION)|!linux-g++ { # Make check with server "qt-test-server.qt-test-net" as a fallback message("testserver: qt-test-server.qt-test-net") } else { |