Merge topic 'googletest-addtests-skipped'

f54963e60f GoogleTest: Reports skipped test with gtest_add_tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7868

Modules/GoogleTest.cmake

@@ -405,6 +405,12 @@ function(gtest_add_tests)
                    --gtest_filter=${gtest_test_name}
                    ${ARGS_EXTRA_ARGS}
         )
+        # Makes sure a skipped GTest is reported as so by CTest
+        set_tests_properties(
+          ${ctest_test_name}
+          PROPERTIES
+          SKIP_REGULAR_EXPRESSION "\\[  SKIPPED \\]"
+        )
         list(APPEND testList ${ctest_test_name})
       endif()
     endforeach()

Tests/RunCMake/GoogleTest/GoogleTest-skip-test-stdout.txt

@@ -1,10 +1,13 @@
 Test project .*
  *Start +[0-9]+: skip_test\.test1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: skip_test\.test1 \.+\*\*\*Skipped +[0-9.]+ sec
+ *Start +[0-9]+: skip_test\.test1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: skip_test\.test1 \.+\*\*\*Skipped +[0-9.]+ sec
 
-100% tests passed, 0 tests failed out of 1
+100% tests passed, 0 tests failed out of 2
 
 Total Test time \(real\) = +[0-9.]+ sec
 
 The following tests did not run:
 [ 	0-9]+- skip_test\.test1 \(Skipped\)
+[ 	0-9]+- skip_test\.test1 \(Skipped\)

Tests/RunCMake/GoogleTest/GoogleTest.cmake

@@ -78,3 +78,7 @@ xcode_sign_adhoc(skip_test)
 gtest_discover_tests(
   skip_test
 )
+
+gtest_add_tests(
+  TARGET skip_test
+)

Tests/RunCMake/GoogleTest/skip_test.cpp

@@ -1,6 +1,13 @@
 #include <iostream>
 #include <string>
 
+/* Having this as comment lets gtest_add_tests recognizes the test we fake
+   here without requiring googletest
+TEST_F( skip_test, test1 )
+{
+}
+*/
+
 int main(int argc, char** argv)
 {
   // Note: GoogleTest.cmake doesn't actually depend on Google Test as such;