Improves support for building Google Test as Windows DLL.

2010-05-05 13:09:35 +00:00
parent 520f623c59
commit c476707e82
6 changed files with 79 additions and 72 deletions
--- 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"
--- 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.
 //