diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-12-21 15:29:11 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-12-22 17:28:39 +0100 |
| commit | 701536b21843de4650ba74017a7cc4ec93a0bdbe (patch) | |
| tree | 83260b6af9bc13ad045ed2325e48d736f0d9b926 /cmake | |
| parent | 27d96b4789b98587e64642bf7bd6ef5f3a07e174 (diff) | |
Allow other projects to use the CMake feature for docker-based tests
Introduce a new QT_TESTSERVER_COMPOSE_FILE variable for setting a custom
docker compose file path, which can be set by projects outside of qtbase
(e.g. QtCoap). If the variable is not set, fallback to the compose file
located in qtbase.
Task-number: QTBUG-85034
Change-Id: I4c0c9b161cad9787b089ef7e9da2aa00352a9159
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 4bfa8f4619..b2fab788a4 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -136,7 +136,11 @@ function(qt_internal_setup_docker_test_fixture name) QT_TEST_SERVER QT_TEST_SERVER_NAME QT_TEST_SERVER_DOMAIN=\"${DNSDOMAIN}\" ) - set(TESTSERVER_COMPOSE_FILE "${QT_SOURCE_TREE}/tests/testserver/docker-compose-bridge-network.yml") + if(DEFINED QT_TESTSERVER_COMPOSE_FILE) + set(TESTSERVER_COMPOSE_FILE ${QT_TESTSERVER_COMPOSE_FILE}) + else() + set(TESTSERVER_COMPOSE_FILE "${QT_SOURCE_TREE}/tests/testserver/docker-compose-bridge-network.yml") + endif() # Bring up test servers and make sure the services are ready. add_test(NAME ${name}-setup COMMAND |