diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest_all_test.cc | 1 | ||||
| -rw-r--r-- | test/gtest_output_test_.cc | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/gtest_all_test.cc b/test/gtest_all_test.cc index e1edb08e..955aa628 100644 --- a/test/gtest_all_test.cc +++ b/test/gtest_all_test.cc @@ -45,4 +45,3 @@ #include "test/gtest-typed-test2_test.cc" #include "test/gtest_unittest.cc" #include "test/production.cc" -#include "src/gtest_main.cc" diff --git a/test/gtest_output_test_.cc b/test/gtest_output_test_.cc index 273e8e93..32fb49a9 100644 --- a/test/gtest_output_test_.cc +++ b/test/gtest_output_test_.cc @@ -1085,9 +1085,7 @@ class BarEnvironment : public testing::Environment { } }; -GTEST_DEFINE_bool_(internal_skip_environment_and_ad_hoc_tests, false, - "This flag causes the program to skip test environment " - "tests and ad hoc tests."); +bool GTEST_FLAG(internal_skip_environment_and_ad_hoc_tests) = false; // The main function. // |