6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-16 23:38:40 +00:00
Code Issues Projects Releases Wiki Activity

Revert r182715 and r182758

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182761 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov 2013-05-28 10:08:08 +00:00
parent e5ee3cfbc1
commit c1a0806ff5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/lit/lit/TestFormats.py
View File

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