summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2017-08-10 20:33:22 (GMT)
committermisterg <misterg@google.com>2017-08-10 20:33:22 (GMT)
commit97a8498873baaf4bdf8e45ff03fd0cecdf9b1658 (patch)
treeca925bda0ec51c8a0c2c01976fcf70004878e9a2 /googletest
parentc3f65335b79f47b05629e79a54685d899bc53b93 (diff)
downloadgoogletest-97a8498873baaf4bdf8e45ff03fd0cecdf9b1658.zip
googletest-97a8498873baaf4bdf8e45ff03fd0cecdf9b1658.tar.gz
googletest-97a8498873baaf4bdf8e45ff03fd0cecdf9b1658.tar.bz2
Addressing Commentsrefs/pull/1191/head
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/BUILD.bazel68
1 files changed, 22 insertions, 46 deletions
diff --git a/googletest/test/BUILD.bazel b/googletest/test/BUILD.bazel
index 6223090..5daa154 100644
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
@@ -37,55 +37,31 @@ licenses(["notice"])
""" gtest own tests """
#on windows exclude gtest-tuple.h and gtest-tuple_test.cc
-filegroup(
- name = "win_only_test_files",
- srcs = glob(
- include = [
- "gtest-*.cc",
- "*.h",
- "googletest/include/gtest/**/*.h",
- ],
- exclude = [
- "googletest/src/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",
- "gtest-death-test_ex_test.cc",
- "gtest-listener_test.cc",
- "gtest-unittest-api_test.cc",
- "gtest-param-test_test.cc",
- ],
- ),
-)
-
-filegroup(
- 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"],
- }),
+ srcs = glob(
+ include = [
+ "gtest-*.cc",
+ "*.h",
+ "googletest/include/gtest/**/*.h",
+ ],
+ exclude = [
+ "gtest-unittest-api_test.cc",
+ "gtest-tuple_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",
+ ],
+ ) + select({
+ "//:win": [],
+ "//conditions:default": [
+ "gtest-tuple_test.cc",
+ ],
+ }),
copts = select({
"//:win": ["-DGTEST_USE_OWN_TR1_TUPLE=0"],
"//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"],