Skip to content

Commit df24665

Browse files
author
vladlosev
committed
Removes obsolete debug code.
git-svn-id: http://googletest.googlecode.com/svn/trunk@623 861a406c-534a-0410-8894-cb66d6ee9925
1 parent 45577ea commit df24665

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

include/gtest/internal/gtest-internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
// This allows a user to use his own types in Google Test assertions by
7474
// overloading the << operator.
7575
//
76-
// util/gtl/stl_logging-inl.h overloads << for STL containers. These
76+
// util/gtl/stl_logging.h overloads << for STL containers. These
7777
// overloads cannot be defined in the std namespace, as that will be
7878
// undefined behavior. Therefore, they are defined in the global
7979
// namespace instead.

test/gtest_env_var_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ def GetFlag(flag):
6767
args = [COMMAND]
6868
if flag is not None:
6969
args += [flag]
70-
return gtest_test_utils.Subprocess(args, env=environ,
71-
capture_stderr=False).output
70+
return gtest_test_utils.Subprocess(args, env=environ).output
7271

7372

7473
def TestFlag(flag, test_val, default_val):

test/gtest_output_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def GetShellCommandOutput(env_cmd):
213213
# Set and save the environment properly.
214214
environ = os.environ.copy()
215215
environ.update(env_cmd[0])
216-
p = gtest_test_utils.Subprocess(env_cmd[1], env=environ, capture_stderr=False)
216+
p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
217217

218218
return p.output
219219

test/gtest_shuffle_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ def RunAndReturnOutput(extra_env, args):
8181
environ_copy = os.environ.copy()
8282
environ_copy.update(extra_env)
8383

84-
return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy,
85-
capture_stderr=False).output
84+
return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
8685

8786

8887
def GetTestsForAllIterations(extra_env, args):

0 commit comments

Comments
 (0)