diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2018-12-11 10:57:51 +0000 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-12-12 09:12:16 +0000 |
| commit | c820e0b11745750a18460f85b697230881438006 (patch) | |
| tree | 4111cfe1b0d5f2bee40763f4bbb1bb5828b22c67 /tests/auto | |
| parent | c47b3f61af4322717ec44c983eebda8eea6f4623 (diff) | |
Revert "Disable Docker-based test servers on Linux temporarily"
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 <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/testserver.pri | 3 |
1 files changed, 0 insertions, 3 deletions
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) { |