shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Revert r182715 and r182758

Browse Source 
llvm-svn: 182761
This commit is contained in:
Alexey Samsonov 2013-05-28 10:08:08 +00:00
parent 34d15151c4
commit 1eba4e3254
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/utils/lit/lit/TestFormats.py
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_in_suite = path_in_suite + (testname, )
yield Test.Test(testSuite, testPath_in_suite, localConfig)
testPath = path_in_suite + (dirname, basename, testname)
yield Test.Test(testSuite, testPath, localConfig)
def getTestsInDirectory(self, testSuite, path_in_suite,
litConfig, localConfig):
source_path = testSuite.getSourcePath(path_in_suite)
@ -73,17 +73,15 @@ 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, filepath_in_suite, execpath,
testSuite, path_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, filepath_in_suite, filepath,
testSuite, path_in_suite, filepath,
litConfig, localConfig):
yield test