Merge topic 'test-labels'

fd3019380d Tests: Removed unused LABELS on CMake's own tests
8f6092fc20 Tests: Move ctest --print-labels case into RunCMake.CTestCommandLine

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !9682

Tests/CMakeLists.txt

@@ -3078,11 +3078,6 @@ if(BUILD_TESTING)
       --output-on-failure -C "\${CTestTest_CONFIG}")
   endif()
 
-  add_test(CTestTestPrintLabels ${CMAKE_CTEST_COMMAND} --print-labels)
-  set_tests_properties(CTestTestPrintLabels PROPERTIES LABELS "Label1;Label2")
-  set_tests_properties(CTestTestPrintLabels PROPERTIES PASS_REGULAR_EXPRESSION
-    "All Labels:.*  Label1.*  Label2")
-
   configure_file(
     "${CMake_SOURCE_DIR}/Tests/CTestTestLabelRegExp/test.cmake.in"
     "${CMake_BINARY_DIR}/Tests/CTestTestLabelRegExp/test.cmake"

Tests/CMakeTests/CMakeLists.txt

@@ -7,7 +7,6 @@ macro(AddCMakeTest TestName PreArgs)
   add_test(NAME CMake.${TestName}
     COMMAND ${CMAKE_EXECUTABLE} ${PreArgs}
     -P "${CMAKE_CURRENT_BINARY_DIR}/${TestName}Test.cmake" ${ARGN})
-  set_tests_properties("CMake.${TestName}" PROPERTIES LABELS "CMake;command")
 endmacro()
 
 

Tests/QtAutogen/Tests.cmake

@@ -47,9 +47,7 @@ ADD_AUTOGEN_TEST(UnityMocSource)
 
 if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocCMP0071)
-  set_property(TEST "Qt${QT_TEST_VERSION}Autogen.MocCMP0071" APPEND PROPERTY LABELS "policy")
   ADD_AUTOGEN_TEST(MocCMP0100)
-  set_property(TEST "Qt${QT_TEST_VERSION}Autogen.MocCMP0100" APPEND PROPERTY LABELS "policy")
   ADD_AUTOGEN_TEST(MocInclude)
   ADD_AUTOGEN_TEST(MocIncludeSymlink)
   ADD_AUTOGEN_TEST(MocSkipSource)

Tests/RunCMake/CMakeLists.txt

@@ -35,10 +35,6 @@ macro(add_RunCMake_test test)
     ${TEST_ARGS}
     -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
     )
-  set_tests_properties("RunCMake.${test}" PROPERTIES LABELS "CMake;run")
-  if(${test} MATCHES ^CMP)
-    set_property(TEST "RunCMake.${test}" APPEND PROPERTY LABELS "policy")
-  endif()
 endmacro()
 
 function(add_RunCMake_test_group test types)

Tests/RunCMake/CTestCommandLine/PrintLabels-stdout.txt

@@ -0,0 +1,6 @@
+^Test project [^
+]*/Tests/RunCMake/CTestCommandLine/PrintLabels
+All Labels:
+  Label1
+  Label2
+  Label3$

Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake

@@ -23,6 +23,20 @@ set_tests_properties(Long_Test_Name_That_Is_Over_Fifty_Characters_In_Length PROP
   run_cmake_command(FailureLabels ${CMAKE_CTEST_COMMAND})
 endblock()
 
+block()
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PrintLabels)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
+add_test(A \"${CMAKE_COMMAND}\" -E true)
+set_tests_properties(A PROPERTIES LABELS \"Label1;Label2\")
+add_test(B \"${CMAKE_COMMAND}\" -E true)
+set_tests_properties(B PROPERTIES LABELS \"Label3\")
+")
+  run_cmake_command(PrintLabels ${CMAKE_CTEST_COMMAND} --print-labels)
+endblock()
+
 run_cmake_command(repeat-opt-bad1
   ${CMAKE_CTEST_COMMAND} --repeat until-pass
   )