From 451ebdff824cad329b40aad9a10cec5e5cb464cc Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Wed, 2 Jan 2019 09:04:34 +0000 Subject: Revert "Disable Docker-based test servers on macOS temporarily" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c1fc47b06aa27e253271d59b6c1f11a6c4ab674a. CI is now running on 18.04 hosts and vmx is enabled on that level. As the update in QTQAINFRA-2288, the macOS 10.13, openSUSE 42.3 and Ubuntu 18.04 had vmx enabled inside the VM. Change-Id: I6ec4094ca826418f46f417b3cab89678bb089417 Reviewed-by: Jędrzej Nowacki Reviewed-by: Qt CI Bot --- tests/auto/testserver.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index eefb29ab19..7dd32db0af 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -53,7 +53,7 @@ TESTSERVER_VERSION = $$system(docker-compose --version) -equals(QMAKE_HOST.os, Darwin)|equals(QMAKE_HOST.os, Windows)|isEmpty(TESTSERVER_VERSION) { +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