diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2021-07-28 13:59:23 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2021-07-28 13:59:23 (GMT) |
| commit | d2515f77e19959e2b8d92f9e313fb0b517a13916 (patch) | |
| tree | fa1a1dbbd0817e072cd9f8fbfdb48826d99fd158 /Tests/RunCMake/ctest_test/RunCMakeTest.cmake | |
| parent | 26170ea3069238bfb287d6304cd2f65e1c3a7387 (diff) | |
| parent | 6efdd7e81480bf48fa2daeb292a12c77e23d3a17 (diff) | |
| download | CMake-d2515f77e19959e2b8d92f9e313fb0b517a13916.zip CMake-d2515f77e19959e2b8d92f9e313fb0b517a13916.tar.gz CMake-d2515f77e19959e2b8d92f9e313fb0b517a13916.tar.bz2 | |
Merge branch 'master' into ctest-test-changing-labels
Diffstat (limited to 'Tests/RunCMake/ctest_test/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index 5f9b32d..de81049 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -158,13 +158,25 @@ add_test( COMMAND ${CMAKE_COMMAND} -E echo <DartMeasurement type="numeric/double" name="my_custom_value">1.4847</DartMeasurement>) add_test( + NAME double_measurement2 + COMMAND ${CMAKE_COMMAND} -E + echo <CTestMeasurement type="numeric/double" name="another_custom_value">1.8474</CTestMeasurement>) +add_test( NAME img_measurement COMMAND ${CMAKE_COMMAND} -E echo <DartMeasurementFile name="TestImage" type="image/png">]] ${IMAGE_DIR}/cmake-logo-16.png [[</DartMeasurementFile>) add_test( + NAME img_measurement2 + COMMAND ${CMAKE_COMMAND} -E + echo <CTestMeasurementFile name="TestImage2" type="image/png">]] ${IMAGE_DIR}/cmake-logo-16.png [[</CTestMeasurementFile>) +add_test( NAME file_measurement COMMAND ${CMAKE_COMMAND} -E echo <DartMeasurementFile name="my_test_input_data" type="file">]] ${IMAGE_DIR}/cmake-logo-16.png [[</DartMeasurementFile>) +add_test( + NAME file_measurement2 + COMMAND ${CMAKE_COMMAND} -E + echo <CTestMeasurementFile name="another_test_input_data" type="file">]] ${IMAGE_DIR}/cmake-logo-16.png [[</CTestMeasurementFile>) ]]) run_ctest(TestMeasurements) endfunction() @@ -194,3 +206,16 @@ set_property(TEST b PROPERTY LABELS b) run_ctest(TestChangingLabels) endfunction() run_changing_labels() + +# Verify that test output can add additional labels +function(run_extra_labels) + set(CASE_CMAKELISTS_SUFFIX_CODE [[ +add_test( + NAME custom_labels + COMMAND ${CMAKE_COMMAND} -E + echo before\n<CTestLabel>label2</CTestLabel>\n<CTestLabel>label1</CTestLabel>\n<CTestLabel>label3</CTestLabel>\n<CTestLabel>label2</CTestLabel>\nafter) +set_tests_properties(custom_labels PROPERTIES LABELS "label1") + ]]) + run_ctest(TestExtraLabels) +endfunction() +run_extra_labels() |