MultiTestRunner.py improvements.

 - Tweak output directories for temp files, derive the temporary base from the
   test's parent directory name, and the test name (instead of the whole path).

llvm-svn: 77059

2 files changed, 14 insertions, 8 deletions

diff --git a/clang/utils/test/MultiTestRunner.py b/clang/utils/test/MultiTestRunner.py
index c43789dad3c..41cf537143d 100755
--- a/clang/utils/test/MultiTestRunner.py
+++ b/clang/utils/test/MultiTestRunner.py
@@ -155,11 +155,10 @@ class Tester(threading.Thread):
 
     def runTest(self, (path,index)):
         command = path
-        # Use hand concatentation here because we want to override
-        # absolute paths.
-        output = 'Output/' + path + '.out'
+        base = TestRunner.getTestOutputBase('Output', path)
+        output = base + '.out'
         testname = path
-        testresults = 'Output/' + path + '.testresults'
+        testresults = base + '.testresults'
         TestRunner.mkdir_p(os.path.dirname(testresults))
         numTests = len(self.provider.tests)
         digits = len(str(numTests))
diff --git a/clang/utils/test/TestRunner.py b/clang/utils/test/TestRunner.py
index d82ddac2d85..c7671033776 100755
--- a/clang/utils/test/TestRunner.py
+++ b/clang/utils/test/TestRunner.py
@@ -16,7 +16,6 @@
 #
 
 import errno
-import hashlib
 import os
 import platform
 import re
@@ -286,6 +285,16 @@ def inferClangCC(clang):
         
     return clangcc
     
+def getTestOutputBase(dir, testpath):
+    """getTestOutputPath(dir, testpath) - Get the full path for temporary files
+    corresponding to the given test path."""
+
+    # Form the output base out of the test parent directory name and the test
+    # name. FIXME: Find a better way to organize test results.
+    return os.path.join(dir, 
+                        os.path.basename(os.path.dirname(testpath)),
+                        os.path.basename(testpath))
+                      
 def main():
     global options
     from optparse import OptionParser
@@ -314,9 +323,7 @@ def main():
 
     for path in args:
         command = path
-        # Use hand concatentation here because we want to override
-        # absolute paths.
-        output = 'Output/' + path + '.out'
+        output = getTestOutputPath('Output', path) + '.out'
         testname = path
         
         res = runOneTest(path, command, output, testname,