Fixed bug when tests in executable partially used absolute paths.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182715 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Galina Kistanova 2013-05-26 03:58:41 +00:00
parent 03abfc7114
commit f0c74bda2e

View File

@ -61,9 +61,9 @@ class GoogleTest(object):
(dirname, basename) = os.path.split(execpath)
# Discover the tests in this executable.
for testname in self.getGTestTests(execpath, litConfig, localConfig):
testPath = path_in_suite + (dirname, basename, testname)
yield Test.Test(testSuite, testPath, localConfig)
testPath_in_suite = path_in_suite + (basename, testname)
yield Test.Test(testSuite, testPath_in_suite, localConfig)
def getTestsInDirectory(self, testSuite, path_in_suite,
litConfig, localConfig):
source_path = testSuite.getSourcePath(path_in_suite)
@ -73,15 +73,17 @@ class GoogleTest(object):
# Iterate over executables in a directory.
if not os.path.normcase(filename) in self.test_sub_dir:
continue
filepath_in_suite = path_in_suite + (filename, )
for subfilename in os.listdir(filepath):
execpath = os.path.join(filepath, subfilename)
for test in self.getTestsInExecutable(
testSuite, path_in_suite, execpath,
testSuite, filepath_in_suite, execpath,
litConfig, localConfig):
yield test
elif ('.' in self.test_sub_dir):
filepath_in_suite = path_in_suite + (filename, )
for test in self.getTestsInExecutable(
testSuite, path_in_suite, filepath,
testSuite, filepath_in_suite, filepath,
litConfig, localConfig):
yield test