Revert r182715 and r182758

llvm-svn: 182761

1 files changed, 5 insertions, 7 deletions

diff --git a/llvm/utils/lit/lit/TestFormats.py b/llvm/utils/lit/lit/TestFormats.py
index 76b7b0c81f1..26541f183bf 100644
--- a/llvm/utils/lit/lit/TestFormats.py
+++ b/llvm/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