diff options
| author | Doug Greiman <dgreiman@google.com> | 2016-02-26 14:26:23 -0800 |
|---|---|---|
| committer | Doug Greiman <dgreiman@google.com> | 2016-02-26 14:26:23 -0800 |
| commit | 5db9cbbc233218630b589a35c4424e22d802f04b (patch) | |
| tree | ce2d72aa2741b1214a3d05e6a691f73308a5f326 /googletest/test | |
| parent | 12b2f23e8e6b1dd97716a091d0b4b18e226e53fb (diff) | |
| download | googletest-5db9cbbc233218630b589a35c4424e22d802f04b.tar.gz googletest-5db9cbbc233218630b589a35c4424e22d802f04b.tar.bz2 googletest-5db9cbbc233218630b589a35c4424e22d802f04b.zip | |
Restructure $XML_OUTPUT_FILE logic
Diffstat (limited to 'googletest/test')
| -rwxr-xr-x | googletest/test/gtest_env_var_test.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/googletest/test/gtest_env_var_test.py b/googletest/test/gtest_env_var_test.py index 13afb2b0..81b59660 100755 --- a/googletest/test/gtest_env_var_test.py +++ b/googletest/test/gtest_env_var_test.py @@ -99,18 +99,24 @@ class GTestEnvVarTest(gtest_test_utils.TestCase): TestFlag('stack_trace_depth', '0', '100') def testXmlOutputFile(self): - """Test that $XML_OUTPUT_FILE affects the output flag.""" + """Test that $XML_OUTPUT_FILE affects the output flag.""" - # $XML_OUTPUT_FILE sets output flag - SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml') - AssertEq('xml:tmp/bar.xml', GetFlag('output')) + try: # $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml') + SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml') AssertEq('xml:tmp/foo.xml', GetFlag('output')) + + # $XML_OUTPUT_FILE without $GTEST_OUTPUT sets output flag + SetEnvVar('GTEST_OUTPUT', None) + AssertEq('xml:tmp/bar.xml', GetFlag('output')) + # If neither set, flag has default value SetEnvVar('XML_OUTPUT_FILE', None) - SetEnvVar('GTEST_OUTPUT', None) AssertEq('', GetFlag('output')) + finally: + SetEnvVar('GTEST_OUTPUT', None) + SetEnvVar('XML_OUTPUT_FILE', None) if __name__ == '__main__': gtest_test_utils.Main() |