diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2019-01-02 09:04:34 +0000 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2019-01-03 03:27:32 +0000 |
| commit | 451ebdff824cad329b40aad9a10cec5e5cb464cc (patch) | |
| tree | 11d919230ac49acee4ad7af5e74e62a01aabb94a | |
| parent | 7f34e8b58ca51b8ce0b0d7757ae903ac9e940c80 (diff) | |
Revert "Disable Docker-based test servers on macOS temporarily"
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 <jedrzej.nowacki@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -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 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 { |