summaryrefslogtreecommitdiffstats
path: root/test/gtest_xml_output_unittest.py
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2008-11-22 02:26:23 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2008-11-22 02:26:23 (GMT)
commit514265c415e072caf92fb4eed57aacdfea9964f1 (patch)
treee84cbd75742ebe5fe28f0811afdadc3d2a27e93e /test/gtest_xml_output_unittest.py
parentd4e57d12d49bae66811d1ac2249abc7004b580e6 (diff)
downloadgoogletest-514265c415e072caf92fb4eed57aacdfea9964f1.zip
googletest-514265c415e072caf92fb4eed57aacdfea9964f1.tar.gz
googletest-514265c415e072caf92fb4eed57aacdfea9964f1.tar.bz2
Fixed two of the failing tests mentioned in issue 9
Diffstat (limited to 'test/gtest_xml_output_unittest.py')
-rwxr-xr-xtest/gtest_xml_output_unittest.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/test/gtest_xml_output_unittest.py b/test/gtest_xml_output_unittest.py
index 7206006..c5f9f57 100755
--- a/test/gtest_xml_output_unittest.py
+++ b/test/gtest_xml_output_unittest.py
@@ -131,9 +131,9 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
if e.errno != errno.ENOENT:
raise
- status = os.system("cd %s && %s %s=xml &> /dev/null"
- % (temp_dir, gtest_prog_path,
- GTEST_OUTPUT_FLAG))
+ status = gtest_test_utils.RunCommandSuppressOutput(
+ "%s %s=xml" % (gtest_prog_path, GTEST_OUTPUT_FLAG),
+ working_dir=temp_dir)
self.assertEquals(0, gtest_test_utils.GetExitStatus(status))
self.assert_(os.path.isfile(output_file))
@@ -150,9 +150,8 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
gtest_prog_path = os.path.join(gtest_test_utils.GetBuildDir(),
gtest_prog_name)
- command = ("%s %s=xml:%s &> /dev/null"
- % (gtest_prog_path, GTEST_OUTPUT_FLAG, xml_path))
- status = os.system(command)
+ command = ("%s %s=xml:%s" % (gtest_prog_path, GTEST_OUTPUT_FLAG, xml_path))
+ status = gtest_test_utils.RunCommandSuppressOutput(command)
if os.WIFSIGNALED(status):
signal = os.WTERMSIG(status)
self.assert_(False,