summaryrefslogtreecommitdiffstats
path: root/coin/instructions/coin_module_test_template_v2.yaml
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-25 15:45:50 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-26 22:14:04 +0200
commita2c772dc58162329a46918950f85e55339939499 (patch)
tree24f36bc733338d4fbc31698cffb37e691ac79fc5 /coin/instructions/coin_module_test_template_v2.yaml
parent9a4391271b527e4489df2ffc44a503797e25b51b (diff)
CMake: Use build environment prefix.bat when running tests
Tests like tst_qmake need the build environment to be able to build apps / libraries. This is mostly needed for MSVC. Set the TESTS_ENV_PREFIX env var to point to the proper prefix.bat (host or target) and use that when running ctest. Task-number: QTBUG-85240 Task-number: QTBUG-78449 Task-number: QTBUG-81365 Change-Id: I6fa68714202ac7fc703973fc772e03b84790a043 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'coin/instructions/coin_module_test_template_v2.yaml')
-rw-r--r--coin/instructions/coin_module_test_template_v2.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml
index f4f65d7d37..786a59e03b 100644
--- a/coin/instructions/coin_module_test_template_v2.yaml
+++ b/coin/instructions/coin_module_test_template_v2.yaml
@@ -2,6 +2,10 @@ type: Group
instructions:
- type: Group
instructions:
+ # The build env is needed on MSVC so that tst_qmake can properly build apps / libraries.
+ - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+ # The test env vars are needed to pick the proper prefix.bat file.
+ - !include "{{qt/qtbase}}/cmake_setup_running_tests_env_vars.yaml"
- !include "{{qt/qtbase}}/coin_module_test_qemu_env_vars.yaml"
- type: Group
instructions: