diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2018-08-15 07:55:46 +0000 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2018-08-15 11:20:00 +0000 |
| commit | 0160b5a6cb25e40a61f6ab2059250a9e93ada592 (patch) | |
| tree | a22a28bd99cbaa32db9a21d7a9477057819c0c8d /tests/auto/testserver.pri | |
| parent | 23d7d5627391be1ad5a13ec6f6ec3fc8db2b1c93 (diff) | |
Revert "Disable Docker-based test servers on QEMU devices temporarily"
This reverts commit 0eb1574b28ced49cc0134c557a1744d4af0f84e6.
Required toolchain update was integrated as:
23560769c1293f7cd7754ed916db2eea42efbd32
Change-Id: I5015a780e31dce5475c8485940ca9de62230e550
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'tests/auto/testserver.pri')
| -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 125d7f0bc6..2adf85a044 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)|!linux-g++ { +equals(QMAKE_HOST.os, Windows)|isEmpty(TESTSERVER_VERSION) { # Make check with server "qt-test-server.qt-test-net" as a fallback message("testserver: qt-test-server.qt-test-net") } else { |