diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-05-28 10:08:08 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-05-28 10:08:08 +0000 |
| commit | c1a0806ff53bef0abc805a4062cd42b05ef8088b (patch) | |
| tree | 73fb3c7101454ec8625824f0e1a96ac16182407d /utils | |
| parent | e5ee3cfbc170561ce6e66c66f7be0ff57aa9ff4c (diff) | |
| download | llvm-c1a0806ff53bef0abc805a4062cd42b05ef8088b.tar.gz llvm-c1a0806ff53bef0abc805a4062cd42b05ef8088b.tar.bz2 llvm-c1a0806ff53bef0abc805a4062cd42b05ef8088b.tar.xz | |
Revert r182715 and r182758
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182761 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lit/lit/TestFormats.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/utils/lit/lit/TestFormats.py b/utils/lit/lit/TestFormats.py index 76b7b0c81f..26541f183b 100644 --- a/utils/lit/lit/TestFormats.py +++ b/utils/lit/lit/TestFormats.py @@ -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 |