diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-25 14:40:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-25 14:40:26 (GMT) |
| commit | e8f9b6ee430a659b8ff772a68fa8b102f7b5d70f (patch) | |
| tree | 97ed2e0dadc8b00f9fa36c7596959110c163af69 /Tests | |
| parent | 063e050f75308ea8f339709c7d64a7047bf2d704 (diff) | |
| parent | c97121270382c37f6bb062755149fd5e323fb20f (diff) | |
| download | CMake-e8f9b6ee430a659b8ff772a68fa8b102f7b5d70f.zip CMake-e8f9b6ee430a659b8ff772a68fa8b102f7b5d70f.tar.gz CMake-e8f9b6ee430a659b8ff772a68fa8b102f7b5d70f.tar.bz2 | |
Merge topic 'test-dir-preset'
c971212703 ctest: Allow --test-dir override when using presets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9448
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 13 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/testDir-presets.json.in | 20 |
2 files changed, 30 insertions, 3 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 3ce2a08..190c6c1 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -542,7 +542,7 @@ run_MemCheckSan(UndefinedBehavior "simulate_sanitizer=1") run_cmake_command(test-dir-invalid-arg ${CMAKE_CTEST_COMMAND} --test-dir) run_cmake_command(test-dir-non-existing-dir ${CMAKE_CTEST_COMMAND} --test-dir non-existing-dir) -function(run_testDir) +function(run_testDir testName testPreset) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/testDir) set(RunCMake_TEST_NO_CLEAN 1) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") @@ -552,9 +552,16 @@ function(run_testDir) add_test(Test1 \"${CMAKE_COMMAND}\" -E true) add_test(Test2 \"${CMAKE_COMMAND}\" -E true) ") - run_cmake_command(testDir ${CMAKE_CTEST_COMMAND} --test-dir "${RunCMake_TEST_BINARY_DIR}/sub") + if (testPreset) + set(presetCommandLine --preset=default) + configure_file( + ${RunCMake_SOURCE_DIR}/testDir-presets.json.in + ${RunCMake_TEST_BINARY_DIR}/CMakePresets.json) + endif() + run_cmake_command(${testName} ${CMAKE_CTEST_COMMAND} --test-dir "${RunCMake_TEST_BINARY_DIR}/sub" ${presetCommandLine}) endfunction() -run_testDir() +run_testDir(testDir 0) +run_testDir(testDir-preset 1) # Test --output-junit function(run_output_junit) diff --git a/Tests/RunCMake/CTestCommandLine/testDir-presets.json.in b/Tests/RunCMake/CTestCommandLine/testDir-presets.json.in new file mode 100644 index 0000000..46391f8 --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/testDir-presets.json.in @@ -0,0 +1,20 @@ +{ + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 22, + "patch": 0 + }, + "configurePresets": [ + { + "name": "default", + "binaryDir": "presetBinaryDir" + } + ], + "testPresets": [ + { + "name": "default", + "configurePreset": "default" + } + ] +} |