Addressing Comments

googletest/test/BUILD.bazel

@@ -37,8 +37,9 @@ licenses(["notice"])
 """ gtest own tests """
 
 #on windows exclude gtest-tuple.h and gtest-tuple_test.cc
-filegroup(
+cc_test(
-    name = "win_only_test_files",
+    name = "gtest_all_test",
+    size = "small",
     srcs =  glob(
                     include = [
                         "gtest-*.cc",
@@ -46,8 +47,7 @@ filegroup(
                         "googletest/include/gtest/**/*.h",
                     ],
                     exclude = [
-            "googletest/src/gtest-unittest-api_test.cc",
+                        "gtest-unittest-api_test.cc",
-            "googletest/include/gtest/internal/gtest-tuple.h",
                         "gtest-tuple_test.cc",
                         "googletest/src/gtest-all.cc",
                         "gtest_all_test.cc",
@@ -56,35 +56,11 @@ filegroup(
                         "gtest-unittest-api_test.cc",
                         "gtest-param-test_test.cc",
                     ],
-    ),
+                ) + select({
-)
+        "//:win": [],
-
+        "//conditions:default": [
-filegroup(
+            "gtest-tuple_test.cc",
-    name = "default_test_files",
-    srcs = glob(
-        include = [
-            "gtest-*.cc",
-            "*.h",
-            "googletest/include/gtest/**/*.h",
         ],
-        exclude = [
-            "googletest/src/gtest-unittest-api_test.cc",
-            "googletest/src/gtest-all.cc",
-            "gtest_all_test.cc",
-            "gtest-death-test_ex_test.cc",
-            "gtest-listener_test.cc",
-            "gtest-unittest-api_test.cc",
-            "gtest-param-test_test.cc",
-        ],
-    ),
-)
-
-cc_test(
-    name = "gtest_all_test",
-    size = "small",
-    srcs = select({
-        "//:win": [":win_only_test_files"],
-        "//conditions:default": [":default_test_files"],
         }),
     copts = select({
         "//:win": ["-DGTEST_USE_OWN_TR1_TUPLE=0"],