mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-26 22:26:16 +00:00
[lit] Make GoogleTest test runner correctly discover tests in the source root
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173907 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
254aed5e22
commit
f68cd7543d
@ -54,28 +54,36 @@ class GoogleTest(object):
|
||||
else:
|
||||
yield ''.join(nested_tests) + ln
|
||||
|
||||
def getTestsInExecutable(self, testSuite, path_in_suite, execpath,
|
||||
litConfig, localConfig):
|
||||
if not execpath.endswith(self.test_suffix):
|
||||
return
|
||||
(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)
|
||||
|
||||
def getTestsInDirectory(self, testSuite, path_in_suite,
|
||||
litConfig, localConfig):
|
||||
source_path = testSuite.getSourcePath(path_in_suite)
|
||||
for filename in os.listdir(source_path):
|
||||
# Check for the one subdirectory (build directory) tests will be in.
|
||||
if not '.' in self.test_sub_dir:
|
||||
filepath = os.path.join(source_path, filename)
|
||||
if os.path.isdir(filepath):
|
||||
# Iterate over executables in a directory.
|
||||
if not os.path.normcase(filename) in self.test_sub_dir:
|
||||
continue
|
||||
|
||||
filepath = os.path.join(source_path, filename)
|
||||
if not os.path.isdir(filepath):
|
||||
continue
|
||||
|
||||
for subfilename in os.listdir(filepath):
|
||||
if subfilename.endswith(self.test_suffix):
|
||||
for subfilename in os.listdir(filepath):
|
||||
execpath = os.path.join(filepath, subfilename)
|
||||
|
||||
# Discover the tests in this executable.
|
||||
for name in self.getGTestTests(execpath, litConfig,
|
||||
localConfig):
|
||||
testPath = path_in_suite + (filename, subfilename, name)
|
||||
yield Test.Test(testSuite, testPath, localConfig)
|
||||
for test in self.getTestsInExecutable(
|
||||
testSuite, path_in_suite, execpath,
|
||||
litConfig, localConfig):
|
||||
yield test
|
||||
elif ('.' in self.test_sub_dir):
|
||||
for test in self.getTestsInExecutable(
|
||||
testSuite, path_in_suite, filepath,
|
||||
litConfig, localConfig):
|
||||
yield test
|
||||
|
||||
def execute(self, test, litConfig):
|
||||
testPath,testName = os.path.split(test.getSourcePath())
|
||||
|
Loading…
Reference in New Issue
Block a user