AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Disable Docker-based test servers on Linux temporarily"

Browse Source 
This reverts commit 4b1ce72c23.

The required SHA-1 updates were integrated as:
qt/qt5    ce3791a214f69b6f0310bfe1d5bcc12ac6927c49
qt/qtbase 75ee55e22a

Change-Id: Ic389128ea9b507c506b18a47090930329a4ff6a2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Ryan Chu 2018-12-11 10:57:51 +00:00 committed by Jędrzej Nowacki
parent c47b3f61af
commit c820e0b117
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/testserver.pri
View File

@ -56,9 +56,6 @@ TESTSERVER_VERSION = $$system(docker-compose --version)
equals(QMAKE_HOST.os, Darwin)|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 # Make check with server "qt-test-server.qt-test-net" as a fallback
message("testserver: qt-test-server.qt-test-net") 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 { } else {
# Make check with test servers # Make check with test servers
equals(QMAKE_HOST.os, Darwin) { equals(QMAKE_HOST.os, Darwin) {