diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-09 02:57:38 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-09 02:57:38 +0000 |
| commit | 7fa242a44b47ce74d7246440b14571f7a5dd1b17 (patch) | |
| tree | 968a9d50b23d7ef33cf37aaed77d23f0407fde7d /test/gtest_xml_outfiles_test.py | |
| parent | c12f63214e9b7761d27e68353e4aaf1761c9cf88 (diff) | |
| download | googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.tar.gz googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.tar.bz2 googletest-7fa242a44b47ce74d7246440b14571f7a5dd1b17.zip | |
Makes the Python tests more stable (by Vlad Losev); fixes a memory leak in GetThreadCount() on Mac (by Vlad Losev); improves fuse_gtest_files.py to support fusing Google Mock files (by Zhanyong Wan).
Diffstat (limited to 'test/gtest_xml_outfiles_test.py')
| -rwxr-xr-x | test/gtest_xml_outfiles_test.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/gtest_xml_outfiles_test.py b/test/gtest_xml_outfiles_test.py index 3e91f6de..9d627932 100755 --- a/test/gtest_xml_outfiles_test.py +++ b/test/gtest_xml_outfiles_test.py @@ -98,8 +98,7 @@ class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase): self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2) def _TestOutFile(self, test_name, expected_xml): - gtest_prog_path = os.path.join(gtest_test_utils.GetBuildDir(), - test_name) + gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name) command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_] p = gtest_test_utils.Subprocess(command, working_dir=tempfile.mkdtemp()) self.assert_(p.exited) |