From 0160b5a6cb25e40a61f6ab2059250a9e93ada592 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Wed, 15 Aug 2018 07:55:46 +0000 Subject: Revert "Disable Docker-based test servers on QEMU devices temporarily" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0eb1574b28ced49cc0134c557a1744d4af0f84e6. Required toolchain update was integrated as: 23560769c1293f7cd7754ed916db2eea42efbd32 Change-Id: I5015a780e31dce5475c8485940ca9de62230e550 Reviewed-by: Jędrzej Nowacki --- tests/auto/testserver.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3