[llvm-commits] [PATCH] GTestFormat should find "*Test" in the source root

[Alexey Samsonov]

Hi chapuni,

This patch makes llvm-lit test discoverer work correctly
if "test_sub_dir" attribute contains a "." subdirectory. This is
necessary to fix compiler-rt unittests after r173617.

http://llvm-reviews.chandlerc.com/D337

Files:
  utils/lit/lit/TestFormats.py

Index: utils/lit/lit/TestFormats.py
===================================================================
--- utils/lit/lit/TestFormats.py
+++ utils/lit/lit/TestFormats.py
@@ -54,28 +54,37 @@
             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)
+        all_tests = []
         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)
+                    all_tests += self.getTestsInExecutable(
+                                    testSuite, path_in_suite, execpath,
+                                    litConfig, localConfig)
+            elif ('.' in self.test_sub_dir):
+                all_tests += self.getTestsInExecutable(
+                    testSuite, path_in_suite, filepath,
+                    litConfig, localConfig)
+        for test in all_tests:
+            yield test
 
     def execute(self, test, litConfig):
         testPath,testName = os.path.split(test.getSourcePath())
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D337.1.patch
Type: text/x-patch
Size: 2726 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130128/ba843eb5/attachment.bin>