From df246651195747a948cad465dc717133e22973d6 Mon Sep 17 00:00:00 2001 From: vladlosev Date: Thu, 6 Sep 2012 17:09:27 +0000 Subject: Removes obsolete debug code. git-svn-id: http://googletest.googlecode.com/svn/trunk@623 861a406c-534a-0410-8894-cb66d6ee9925 --- include/gtest/internal/gtest-internal.h | 2 +- test/gtest_env_var_test.py | 3 +-- test/gtest_output_test.py | 2 +- test/gtest_shuffle_test.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index a4d1839..ede95f5 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -73,7 +73,7 @@ // This allows a user to use his own types in Google Test assertions by // overloading the << operator. // -// util/gtl/stl_logging-inl.h overloads << for STL containers. These +// util/gtl/stl_logging.h overloads << for STL containers. These // overloads cannot be defined in the std namespace, as that will be // undefined behavior. Therefore, they are defined in the global // namespace instead. diff --git a/test/gtest_env_var_test.py b/test/gtest_env_var_test.py index 4728bbc..ac24337 100755 --- a/test/gtest_env_var_test.py +++ b/test/gtest_env_var_test.py @@ -67,8 +67,7 @@ def GetFlag(flag): args = [COMMAND] if flag is not None: args += [flag] - return gtest_test_utils.Subprocess(args, env=environ, - capture_stderr=False).output + return gtest_test_utils.Subprocess(args, env=environ).output def TestFlag(flag, test_val, default_val): diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py index 72b3ae0..f409e2a 100755 --- a/test/gtest_output_test.py +++ b/test/gtest_output_test.py @@ -213,7 +213,7 @@ def GetShellCommandOutput(env_cmd): # Set and save the environment properly. environ = os.environ.copy() environ.update(env_cmd[0]) - p = gtest_test_utils.Subprocess(env_cmd[1], env=environ, capture_stderr=False) + p = gtest_test_utils.Subprocess(env_cmd[1], env=environ) return p.output diff --git a/test/gtest_shuffle_test.py b/test/gtest_shuffle_test.py index d3e5780..30d0303 100755 --- a/test/gtest_shuffle_test.py +++ b/test/gtest_shuffle_test.py @@ -81,8 +81,7 @@ def RunAndReturnOutput(extra_env, args): environ_copy = os.environ.copy() environ_copy.update(extra_env) - return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy, - capture_stderr=False).output + return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output def GetTestsForAllIterations(extra_env, args): -- cgit v1.2.1