From f63e2a14a21aa0528e692d2d5ce1d8e53dfa5742 Mon Sep 17 00:00:00 2001 From: misterg Date: Tue, 1 Aug 2017 14:36:29 -0400 Subject: WIP --- BUILD.bazel | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 BUILD.bazel (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel new file mode 100644 index 00000000..50a6aca3 --- /dev/null +++ b/BUILD.bazel @@ -0,0 +1,292 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +config_setting( + name = "win", + values = {"cpu": "x64_windows_msvc"}, +) + +cc_library( + name = "gmock", + srcs = glob( + include = [ + "googlemock/src/*.cc", + "googlemock/include/gmock/**/*.h", + ], + exclude = [ + "googlemock/src/gmock-all.cc", + ], + ), + hdrs = glob([ + "googlemock/include/gmock/*.h", + ]), + includes = [ + "googlemock", + "googlemock/include", + ], + linkopts = select({ + ":win": [], + "//conditions:default": ["-pthread"], + }), + deps = [ + ":gtest", + ], +) + +cc_library( + name = "gtest", + srcs = glob( + include = [ + "googletest/src/*.cc", + "googletest/src/*.h", + "googletest/include/gtest/**/*.h", + ], + exclude = [ + "googletest/src/gtest-all.cc", + "googletest/src/gtest_main.cc", + ], + ), + hdrs = glob([ + "googletest/include/gtest/*.h", + ]), + copts = select( + { + ":win": [], + "//conditions:default": ["-pthread"], + }, + ), + includes = [ + "googletest", + "googletest/include", + ], + linkopts = select({ + ":win": [], + "//conditions:default": [ + "-pthread", + ], + }), +) + +cc_library( + name = "gtest_main", + srcs = glob( + include = [ + "googletest/src/gtest_main.cc", + ], + ), + hdrs = glob([ + "googletest/include/gtest/*.h", + "googletest/include/gtest/**/*.h", + ]), + includes = [ + "googletest", + "googletest/include", + ], + deps = [":gmock"], +) + +"""googletest own tests """ + +#on windows exclude gtest-tuple.h and gtest-tuple_test.cc +filegroup( + name = "win_only_test_files", + srcs = glob( + include = [ + "googletest/test/gtest-*.cc", + "googletest/test/*.h", + "googletest/include/gtest/**/*.h", + ], + exclude = [ + "googletest/src/gtest-unittest-api_test.cc", + "googletest/include/gtest/internal/gtest-tuple.h", + "googletest/test/gtest-tuple_test.cc", + "googletest/src/gtest-all.cc", + "googletest/test/gtest_all_test.cc", + "googletest/test/gtest-death-test_ex_test.cc", + "googletest/test/gtest-listener_test.cc", + "googletest/test/gtest-unittest-api_test.cc", + "googletest/test/gtest-param-test_test.cc", + ], + ), +) + +filegroup( + name = "default_test_files", + srcs = glob( + include = [ + "googletest/test/gtest-*.cc", + "googletest/test/*.h", + "googletest/include/gtest/**/*.h", + ], + exclude = [ + "googletest/src/gtest-unittest-api_test.cc", + "googletest/src/gtest-all.cc", + "googletest/test/gtest_all_test.cc", + "googletest/test/gtest-death-test_ex_test.cc", + "googletest/test/gtest-listener_test.cc", + "googletest/test/gtest-unittest-api_test.cc", + "googletest/test/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"], + "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"], + }), + includes = [ + "googletest", + "googletest/include", + "googletest/include/internal", + "googletest/test", + ], + linkopts = select({ + ":win": [], + "//conditions:default": [ + "-pthread", + ], + }), + deps = [":gtest_main"], +) + +""" these googletest tests have their own main()""" + +cc_test( + name = "gtest-death-test", + size = "small", + srcs = [ + "googletest/test/gtest-death-test_ex_test.cc", + ], + copts = [ + "-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1", + ], + deps = [ + ":gtest_main", + ], +) + +cc_test( + name = "gtest-listener_test", + size = "small", + srcs = [ + "googletest/test/gtest-listener_test.cc", + ], + deps = [ + ":gtest_main", + ], +) + +cc_test( + name = "gtest-unittest-api_test", + size = "small", + srcs = [ + "googletest/test/gtest-unittest-api_test.cc", + ], + deps = [ + ":gtest_main", + ], +) + +cc_test( + name = "gtest-param-test_test", + size = "small", + srcs = [ + "googletest/test/gtest-param-test2_test.cc", + "googletest/test/gtest-param-test_test.cc", + "googletest/test/gtest-param-test_test.h", + ], + deps = [ + ":gtest_main", + ], +) + +""" googletest samples""" + +cc_library( + name = "googletest_sample_lib", + srcs = [ + "googletest/samples/sample1.cc", + "googletest/samples/sample2.cc", + "googletest/samples/sample4.cc", + ], + hdrs = [ + "googletest/samples/prime_tables.h", + "googletest/samples/sample1.h", + "googletest/samples/sample2.h", + "googletest/samples/sample3-inl.h", + "googletest/samples/sample4.h", + ], + deps = ["gtest"], +) + +cc_test( + name = "googletest_samples", + size = "small", + srcs = glob( + include = [ + "googletest/samples/sample*.cc", + "googletest/samples/sample*.h", + ], + exclude = [ + "googletest/samples/sample1.cc", + "googletest/samples/sample2.cc", + "googletest/samples/sample4.cc", + "googletest/samples/prime_tables.h", + "googletest/samples/sample1.h", + "googletest/samples/sample2.h", + "googletest/samples/sample3-inl.h", + "googletest/samples/sample4.h", + "googletest/samples/sample9_unittest.cc", + "googletest/samples/sample10_unittest.cc", + ], + ), + includes = [ + "googletest/samples", + ], + deps = [ + ":googletest_sample_lib", + ":gtest_main", + ], +) + +""" googletest samples 9 and 10 have their own main()""" + +cc_test( + name = "googletest_sample9", + size = "small", + srcs = glob( + include = [ + "googletest/samples/sample9_unittest.cc", + ], + ), + includes = [ + "googletest/samples", + ], + deps = [ + ":gtest", + ], +) + +cc_test( + name = "googletest_sample10", + size = "small", + srcs = glob( + include = [ + "googletest/samples/sample10_unittest.cc", + ], + ), + includes = [ + "googletest/samples", + ], + deps = [ + ":gtest", + ], +) -- cgit v1.2.3 From b3edada2907032f15b1a61e6a49f4e3ece091888 Mon Sep 17 00:00:00 2001 From: misterg Date: Tue, 1 Aug 2017 14:50:59 -0400 Subject: WIP --- BUILD.bazel | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 50a6aca3..aa53a135 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -86,7 +86,7 @@ cc_library( deps = [":gmock"], ) -"""googletest own tests """ +"""gtest own tests """ #on windows exclude gtest-tuple.h and gtest-tuple_test.cc filegroup( @@ -211,7 +211,7 @@ cc_test( """ googletest samples""" cc_library( - name = "googletest_sample_lib", + name = "gtest_sample_lib", srcs = [ "googletest/samples/sample1.cc", "googletest/samples/sample2.cc", @@ -228,7 +228,7 @@ cc_library( ) cc_test( - name = "googletest_samples", + name = "gtest_samples", size = "small", srcs = glob( include = [ @@ -252,7 +252,7 @@ cc_test( "googletest/samples", ], deps = [ - ":googletest_sample_lib", + ":gtest_sample_lib", ":gtest_main", ], ) @@ -260,7 +260,7 @@ cc_test( """ googletest samples 9 and 10 have their own main()""" cc_test( - name = "googletest_sample9", + name = "gtest_sample9", size = "small", srcs = glob( include = [ @@ -271,12 +271,12 @@ cc_test( "googletest/samples", ], deps = [ - ":gtest", + ":gtest_main", ], ) cc_test( - name = "googletest_sample10", + name = "gtest_sample10", size = "small", srcs = glob( include = [ @@ -287,6 +287,6 @@ cc_test( "googletest/samples", ], deps = [ - ":gtest", + ":gtest_main", ], ) -- cgit v1.2.3 From 6615f7df11c812ed15d0be13a4d4c92aaee26dfb Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 2 Aug 2017 14:36:39 -0400 Subject: WIP --- BUILD.bazel | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index aa53a135..4977d1be 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -86,7 +86,7 @@ cc_library( deps = [":gmock"], ) -"""gtest own tests """ +""" gtest own tests """ #on windows exclude gtest-tuple.h and gtest-tuple_test.cc filegroup( @@ -157,8 +157,7 @@ cc_test( deps = [":gtest_main"], ) -""" these googletest tests have their own main()""" - +#These googletest tests have their own main() cc_test( name = "gtest-death-test", size = "small", @@ -208,8 +207,7 @@ cc_test( ], ) -""" googletest samples""" - +# The following rules build samples of how to use gTest. cc_library( name = "gtest_sample_lib", srcs = [ @@ -224,41 +222,35 @@ cc_library( "googletest/samples/sample3-inl.h", "googletest/samples/sample4.h", ], - deps = ["gtest"], ) cc_test( name = "gtest_samples", size = "small", srcs = glob( + # All Samples here except + # Sample9 is designed to fail on purpose + # Sample10 can be run with --check_for_leaks command line flag, should be separate include = [ - "googletest/samples/sample*.cc", - "googletest/samples/sample*.h", - ], - exclude = [ - "googletest/samples/sample1.cc", - "googletest/samples/sample2.cc", - "googletest/samples/sample4.cc", - "googletest/samples/prime_tables.h", - "googletest/samples/sample1.h", - "googletest/samples/sample2.h", - "googletest/samples/sample3-inl.h", - "googletest/samples/sample4.h", - "googletest/samples/sample9_unittest.cc", - "googletest/samples/sample10_unittest.cc", + "googletest/samples/sample1_unitest.cc", + "googletest/samples/sample2_unitest.cc", + "googletest/samples/sample3_unitest.cc", + "googletest/samples/sample4_unitest.cc", + "googletest/samples/sample5_unitest.cc", + "googletest/samples/sample6_unitest.cc", + "googletest/samples/sample7_unitest.cc", + "googletest/samples/sample8_unitest.cc", ], ), includes = [ "googletest/samples", ], deps = [ - ":gtest_sample_lib", ":gtest_main", + ":gtest_sample_lib", ], ) -""" googletest samples 9 and 10 have their own main()""" - cc_test( name = "gtest_sample9", size = "small", -- cgit v1.2.3 From aa31cb67c2a9db4e6a93839bc2a29fe45e1dbd73 Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 2 Aug 2017 15:40:14 -0400 Subject: WIP --- BUILD.bazel | 56 ++++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 36 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 4977d1be..9922e8f6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -207,6 +207,7 @@ cc_test( ], ) + # The following rules build samples of how to use gTest. cc_library( name = "gtest_sample_lib", @@ -228,57 +229,40 @@ cc_test( name = "gtest_samples", size = "small", srcs = glob( - # All Samples here except - # Sample9 is designed to fail on purpose - # Sample10 can be run with --check_for_leaks command line flag, should be separate include = [ - "googletest/samples/sample1_unitest.cc", - "googletest/samples/sample2_unitest.cc", - "googletest/samples/sample3_unitest.cc", - "googletest/samples/sample4_unitest.cc", - "googletest/samples/sample5_unitest.cc", - "googletest/samples/sample6_unitest.cc", - "googletest/samples/sample7_unitest.cc", - "googletest/samples/sample8_unitest.cc", + #All Samples here except: + #sample9 designed to fail + #sample10 takes a command line option and needs to be separate + "googletest/samples/sample1_unittest.cc", + "googletest/samples/sample2_unittest.cc", + "googletest/samples/sample3_unittest.cc", + "googletest/samples/sample4_unittest.cc", + "googletest/samples/sample5_unittest.cc", + "googletest/samples/sample6_unittest.cc", + "googletest/samples/sample7_unittest.cc", + "googletest/samples/sample8_unittest.cc", ], ), - includes = [ - "googletest/samples", - ], deps = [ + "gtest_sample_lib", ":gtest_main", - ":gtest_sample_lib", ], ) cc_test( - name = "gtest_sample9", + name = "sample9_unittest", size = "small", - srcs = glob( - include = [ - "googletest/samples/sample9_unittest.cc", - ], - ), - includes = [ - "googletest/samples", - ], - deps = [ - ":gtest_main", - ], + srcs = ["googletest/samples/sample9_unittest.cc"], + deps = [":gtest_main"], ) cc_test( - name = "gtest_sample10", + name = "sample10_unittest", size = "small", - srcs = glob( - include = [ - "googletest/samples/sample10_unittest.cc", - ], - ), - includes = [ - "googletest/samples", - ], + srcs = ["googletest/samples/sample10_unittest.cc"], deps = [ ":gtest_main", ], ) + + -- cgit v1.2.3 From 8815087cfa124b8b7f6e991189ec50a6bd439c83 Mon Sep 17 00:00:00 2001 From: misterg Date: Tue, 8 Aug 2017 15:17:56 -0400 Subject: WIP --- BUILD.bazel | 202 ++++++++++++++++++------------------------------------------ 1 file changed, 60 insertions(+), 142 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 9922e8f6..97315042 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,12 +1,13 @@ +# Copyright 2017 Google Inc. All Rights Reserved. +# Author: misterg@google.com (Gennadiy Civil) +# +# Description: +# Bazel BUILD file for googletest, initial revision +# package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -config_setting( - name = "win", - values = {"cpu": "x64_windows_msvc"}, -) - cc_library( name = "gmock", srcs = glob( @@ -34,6 +35,18 @@ cc_library( ], ) +# gtest public API. +GTEST_HDRS = \ + glob([ + "googletest/include/gtest/*.h", + ]) + +config_setting( + name = "win", + values = {"cpu": "x64_windows_msvc"}, +) + +# Google Test cc_library( name = "gtest", srcs = glob( @@ -47,9 +60,7 @@ cc_library( "googletest/src/gtest_main.cc", ], ), - hdrs = glob([ - "googletest/include/gtest/*.h", - ]), + hdrs = GTEST_HDRS, copts = select( { ":win": [], @@ -68,85 +79,30 @@ cc_library( }), ) +## Google Test with exceptions enabled. cc_library( - name = "gtest_main", + name = "gtest_ex", srcs = glob( include = [ - "googletest/src/gtest_main.cc", - ], - ), - hdrs = glob([ - "googletest/include/gtest/*.h", - "googletest/include/gtest/**/*.h", - ]), - includes = [ - "googletest", - "googletest/include", - ], - deps = [":gmock"], -) - -""" gtest own tests """ - -#on windows exclude gtest-tuple.h and gtest-tuple_test.cc -filegroup( - name = "win_only_test_files", - srcs = glob( - include = [ - "googletest/test/gtest-*.cc", - "googletest/test/*.h", + "googletest/src/*.cc", + "googletest/src/*.h", "googletest/include/gtest/**/*.h", ], exclude = [ - "googletest/src/gtest-unittest-api_test.cc", - "googletest/include/gtest/internal/gtest-tuple.h", - "googletest/test/gtest-tuple_test.cc", "googletest/src/gtest-all.cc", - "googletest/test/gtest_all_test.cc", - "googletest/test/gtest-death-test_ex_test.cc", - "googletest/test/gtest-listener_test.cc", - "googletest/test/gtest-unittest-api_test.cc", - "googletest/test/gtest-param-test_test.cc", + "googletest/src/gtest_main.cc", ], ), -) - -filegroup( - name = "default_test_files", - srcs = glob( - include = [ - "googletest/test/gtest-*.cc", - "googletest/test/*.h", - "googletest/include/gtest/**/*.h", - ], - exclude = [ - "googletest/src/gtest-unittest-api_test.cc", - "googletest/src/gtest-all.cc", - "googletest/test/gtest_all_test.cc", - "googletest/test/gtest-death-test_ex_test.cc", - "googletest/test/gtest-listener_test.cc", - "googletest/test/gtest-unittest-api_test.cc", - "googletest/test/gtest-param-test_test.cc", - ], + hdrs = GTEST_HDRS, + copts = ["-fexceptions"] + select( + { + ":win": [], + "//conditions:default": ["-pthread"], + }, ), -) - -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"], - "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"], - }), includes = [ "googletest", "googletest/include", - "googletest/include/internal", - "googletest/test", ], linkopts = select({ ":win": [], @@ -154,60 +110,26 @@ cc_test( "-pthread", ], }), - deps = [":gtest_main"], ) -#These googletest tests have their own main() -cc_test( - name = "gtest-death-test", - size = "small", - srcs = [ - "googletest/test/gtest-death-test_ex_test.cc", - ], - copts = [ - "-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1", - ], - deps = [ - ":gtest_main", - ], -) - -cc_test( - name = "gtest-listener_test", - size = "small", - srcs = [ - "googletest/test/gtest-listener_test.cc", - ], - deps = [ - ":gtest_main", - ], -) - -cc_test( - name = "gtest-unittest-api_test", - size = "small", - srcs = [ - "googletest/test/gtest-unittest-api_test.cc", - ], - deps = [ - ":gtest_main", - ], -) - -cc_test( - name = "gtest-param-test_test", - size = "small", - srcs = [ - "googletest/test/gtest-param-test2_test.cc", - "googletest/test/gtest-param-test_test.cc", - "googletest/test/gtest-param-test_test.h", - ], - deps = [ - ":gtest_main", +cc_library( + name = "gtest_main", + srcs = glob( + include = [ + "googletest/src/gtest_main.cc", + ], + ), + hdrs = glob([ + "googletest/include/gtest/*.h", + "googletest/include/gtest/**/*.h", + ]), + includes = [ + "googletest", + "googletest/include", ], + deps = ["//:gtest"], ) - # The following rules build samples of how to use gTest. cc_library( name = "gtest_sample_lib", @@ -228,21 +150,19 @@ cc_library( cc_test( name = "gtest_samples", size = "small", - srcs = glob( - include = [ - #All Samples here except: - #sample9 designed to fail - #sample10 takes a command line option and needs to be separate - "googletest/samples/sample1_unittest.cc", - "googletest/samples/sample2_unittest.cc", - "googletest/samples/sample3_unittest.cc", - "googletest/samples/sample4_unittest.cc", - "googletest/samples/sample5_unittest.cc", - "googletest/samples/sample6_unittest.cc", - "googletest/samples/sample7_unittest.cc", - "googletest/samples/sample8_unittest.cc", - ], - ), + #All Samples except: + #sample9 ( main ) + #sample10 (main and takes a command line option and needs to be separate) + srcs = [ + "googletest/samples/sample1_unittest.cc", + "googletest/samples/sample2_unittest.cc", + "googletest/samples/sample3_unittest.cc", + "googletest/samples/sample4_unittest.cc", + "googletest/samples/sample5_unittest.cc", + "googletest/samples/sample6_unittest.cc", + "googletest/samples/sample7_unittest.cc", + "googletest/samples/sample8_unittest.cc", + ], deps = [ "gtest_sample_lib", ":gtest_main", @@ -253,7 +173,7 @@ cc_test( name = "sample9_unittest", size = "small", srcs = ["googletest/samples/sample9_unittest.cc"], - deps = [":gtest_main"], + deps = [":gtest"], ) cc_test( @@ -261,8 +181,6 @@ cc_test( size = "small", srcs = ["googletest/samples/sample10_unittest.cc"], deps = [ - ":gtest_main", + ":gtest", ], ) - - -- cgit v1.2.3 From e66b6bc868055f92a35ae0784a11ce87ec936c4d Mon Sep 17 00:00:00 2001 From: misterg Date: Tue, 8 Aug 2017 15:41:44 -0400 Subject: WIP, win testing --- BUILD.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 97315042..35123b84 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -94,10 +94,10 @@ cc_library( ], ), hdrs = GTEST_HDRS, - copts = ["-fexceptions"] + select( + copts = select( { - ":win": [], - "//conditions:default": ["-pthread"], + ":win": ["-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"], + "//conditions:default": ["-fexceptions","-pthread"], }, ), includes = [ -- cgit v1.2.3 From ac885f3ab2a50689f334d2bf3a53ead9312601dc Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 9 Aug 2017 11:47:54 -0400 Subject: WIP --- BUILD.bazel | 78 +++++++------------------------------------------------------ 1 file changed, 9 insertions(+), 69 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 35123b84..9c58f81e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -8,37 +8,11 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -cc_library( - name = "gmock", - srcs = glob( - include = [ - "googlemock/src/*.cc", - "googlemock/include/gmock/**/*.h", - ], - exclude = [ - "googlemock/src/gmock-all.cc", - ], - ), - hdrs = glob([ - "googlemock/include/gmock/*.h", - ]), - includes = [ - "googlemock", - "googlemock/include", - ], - linkopts = select({ - ":win": [], - "//conditions:default": ["-pthread"], - }), - deps = [ - ":gtest", - ], -) - # gtest public API. GTEST_HDRS = \ glob([ "googletest/include/gtest/*.h", + "googlemock/include/gmock/*.h", ]) config_setting( @@ -54,10 +28,13 @@ cc_library( "googletest/src/*.cc", "googletest/src/*.h", "googletest/include/gtest/**/*.h", + "googlemock/src/*.cc", + "googlemock/include/gmock/**/*.h", ], exclude = [ "googletest/src/gtest-all.cc", "googletest/src/gtest_main.cc", + "googlemock/src/gmock-all.cc", ], ), hdrs = GTEST_HDRS, @@ -68,39 +45,8 @@ cc_library( }, ), includes = [ - "googletest", - "googletest/include", - ], - linkopts = select({ - ":win": [], - "//conditions:default": [ - "-pthread", - ], - }), -) - -## Google Test with exceptions enabled. -cc_library( - name = "gtest_ex", - srcs = glob( - include = [ - "googletest/src/*.cc", - "googletest/src/*.h", - "googletest/include/gtest/**/*.h", - ], - exclude = [ - "googletest/src/gtest-all.cc", - "googletest/src/gtest_main.cc", - ], - ), - hdrs = GTEST_HDRS, - copts = select( - { - ":win": ["-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"], - "//conditions:default": ["-fexceptions","-pthread"], - }, - ), - includes = [ + "googlemock", + "googlemock/include", "googletest", "googletest/include", ], @@ -114,15 +60,9 @@ cc_library( cc_library( name = "gtest_main", - srcs = glob( - include = [ - "googletest/src/gtest_main.cc", - ], - ), - hdrs = glob([ - "googletest/include/gtest/*.h", - "googletest/include/gtest/**/*.h", - ]), + srcs = [ + "googletest/src/gtest_main.cc", + ], includes = [ "googletest", "googletest/include", -- cgit v1.2.3 From 66a036959f09071fa0d5f7af4a5cbf470a2c6137 Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 9 Aug 2017 14:37:58 -0400 Subject: WIP --- BUILD.bazel | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 9c58f81e..1d2f6b87 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -8,19 +8,12 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -# gtest public API. -GTEST_HDRS = \ - glob([ - "googletest/include/gtest/*.h", - "googlemock/include/gmock/*.h", - ]) - config_setting( name = "win", values = {"cpu": "x64_windows_msvc"}, ) -# Google Test +# Google Test including Google Mock cc_library( name = "gtest", srcs = glob( @@ -35,9 +28,13 @@ cc_library( "googletest/src/gtest-all.cc", "googletest/src/gtest_main.cc", "googlemock/src/gmock-all.cc", + "googlemock/src/gmock_main.cc", ], ), - hdrs = GTEST_HDRS, + hdrs =glob([ + "googletest/include/gtest/*.h", + "googlemock/include/gmock/*.h", + ]), copts = select( { ":win": [], @@ -123,4 +120,4 @@ cc_test( deps = [ ":gtest", ], -) +) \ No newline at end of file -- cgit v1.2.3 From b98e30b42704e214871f6baba458ba7c1066d0ed Mon Sep 17 00:00:00 2001 From: misterg Date: Thu, 10 Aug 2017 11:54:46 -0400 Subject: Initial Revision, review 164634031 --- BUILD.bazel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 1d2f6b87..dba50cc9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -120,4 +120,5 @@ cc_test( deps = [ ":gtest", ], -) \ No newline at end of file +) +git \ No newline at end of file -- cgit v1.2.3 From cb5b05436dfc247399c8a3cc0dc6199bb00200f8 Mon Sep 17 00:00:00 2001 From: misterg Date: Thu, 10 Aug 2017 12:03:27 -0400 Subject: Added Copyright --- BUILD.bazel | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index dba50cc9..c48e0292 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,9 +1,37 @@ -# Copyright 2017 Google Inc. All Rights Reserved. -# Author: misterg@google.com (Gennadiy Civil) +# Copyright 2017 Google Inc. +# All Rights Reserved. +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. # -# Description: -# Bazel BUILD file for googletest, initial revision +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Author: misterg@google.com (Gennadiy Civil) +# +# Bazel Build for Google C++ Testing Framework(Google Test) + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) @@ -121,4 +149,3 @@ cc_test( ":gtest", ], ) -git \ No newline at end of file -- cgit v1.2.3 From c3f65335b79f47b05629e79a54685d899bc53b93 Mon Sep 17 00:00:00 2001 From: misterg Date: Thu, 10 Aug 2017 15:33:09 -0400 Subject: Addressing comments --- BUILD.bazel | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index c48e0292..a4423740 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -86,11 +86,7 @@ cc_library( cc_library( name = "gtest_main", srcs = [ - "googletest/src/gtest_main.cc", - ], - includes = [ - "googletest", - "googletest/include", + "googlemock/src/gmock_main.cc", ], deps = ["//:gtest"], ) -- cgit v1.2.3