From c1fc47b06aa27e253271d59b6c1f11a6c4ab674a Mon Sep 17 00:00:00 2001
From: Ryan Chu <ryan.chu@qt.io>
Date: Thu, 29 Nov 2018 19:41:15 +0100
Subject: [PATCH] Disable Docker-based test servers on macOS temporarily
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tests of QNetworkReply keep failing due to VT-x is not available in
Coin environment. The VT-x/AMD-v feature is necessary when starting the
virtual machines. Before VT-X is added back to the CPU features, the
macOS platform should keep using the remote test server.

Task-number: QTQAINFRA-2288
Change-Id: Ib37d0e7a5fb1fb4ed5484f925f5023b19467e672
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 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 7dd32db0af..eefb29ab19 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, Windows)|isEmpty(TESTSERVER_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 {