Addressing Comments

This commit is contained in:
misterg 2017-08-10 16:33:22 -04:00
parent c3f65335b7
commit 97a8498873

View File

@ -37,8 +37,9 @@ licenses(["notice"])
""" gtest own tests """
#on windows exclude gtest-tuple.h and gtest-tuple_test.cc
filegroup(
name = "win_only_test_files",
cc_test(
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",
"googletest/include/gtest/internal/gtest-tuple.h",
"gtest-unittest-api_test.cc",
"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",
],
),
)
filegroup(
name = "default_test_files",
srcs = glob(
include = [
"gtest-*.cc",
"*.h",
"googletest/include/gtest/**/*.h",
) + select({
"//:win": [],
"//conditions:default": [
"gtest-tuple_test.cc",
],
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"],