From c820e0b11745750a18460f85b697230881438006 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Tue, 11 Dec 2018 10:57:51 +0000 Subject: Revert "Disable Docker-based test servers on Linux temporarily" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4b1ce72c232b21fb1a8ae8ca86c2b8a7bc00b993. The required SHA-1 updates were integrated as: qt/qt5 ce3791a214f69b6f0310bfe1d5bcc12ac6927c49 qt/qtbase 75ee55e22a49327193aade21bf615efc7c879564 Change-Id: Ic389128ea9b507c506b18a47090930329a4ff6a2 Reviewed-by: Edward Welbourne Reviewed-by: Jędrzej Nowacki --- tests/auto/testserver.pri | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 3289a14fd2..eefb29ab19 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -56,9 +56,6 @@ TESTSERVER_VERSION = $$system(docker-compose --version) equals(QMAKE_HOST.os, Darwin)|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:equals(QMAKE_HOST.os, Linux) { - # Disable Docker-based test server and use "qt-test-server.qt-test-net" server as a fallback - message("testserver: qt-test-server.qt-test-net") } else { # Make check with test servers equals(QMAKE_HOST.os, Darwin) { -- cgit v1.2.3