merges, gtest

2018-03-26 13:04:28 -04:00
parent 6aae206bc2
commit 3df7cbe6f7
4 changed files with 19 additions and 13 deletions
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
@@ -100,6 +100,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase):
      TestFlag('death_test_use_fork', '1', '0')
      TestFlag('stack_trace_depth', '0', '100')

+
  def testXmlOutputFile(self):
    """Tests that $XML_OUTPUT_FILE affects the output flag."""