diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-05 13:09:35 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-05 13:09:35 +0000 |
| commit | c476707e82f8db4974912594fbf419326973cb2a (patch) | |
| tree | 344548e468d47fa5788cfe7f01e9f65b815b23f6 /test | |
| parent | 520f623c5940686b0827eff8b608c4b68aa557d6 (diff) | |
| download | googletest-c476707e82f8db4974912594fbf419326973cb2a.tar.gz googletest-c476707e82f8db4974912594fbf419326973cb2a.tar.bz2 googletest-c476707e82f8db4974912594fbf419326973cb2a.zip | |
Improves support for building Google Test as Windows DLL.
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. // |