[test-suite] r254126 - lit.cfg: Cleanup config usage

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Nov 25 21:35:22 2015
New Revision: 254126

URL: http://llvm.org/viewvc/llvm-project?rev=254126&view=rev
Log:
lit.cfg: Cleanup config usage

Modified:
    test-suite/trunk/lit.cfg

Modified: test-suite/trunk/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/lit.cfg?rev=254126&r1=254125&r2=254126&view=diff
==============================================================================
--- test-suite/trunk/lit.cfg (original)
+++ test-suite/trunk/lit.cfg Wed Nov 25 21:35:22 2015
@@ -85,7 +85,8 @@ class TestSuiteTest(FileBasedTest):
         super(TestSuiteTest, self).__init__()
         
     def execute(self, test, litConfig):
-        if test.config.unsupported:
+        config = test.config
+        if config.unsupported:
             return (Test.UNSUPPORTED, 'Test is unsupported')
 
         # Parse benchmark script
@@ -114,10 +115,11 @@ class TestSuiteTest(FileBasedTest):
                     del commandline[i+1]
                     del commandline[i]
                     break
-            timeit = config.test_source_root + "/tools/timeit"
+            timeit = "%s/tools/timeit" % config.test_source_root
+            runsafely = "%s/RunSafely.sh" % config.test_suite_root
             timeout = "7200"
-            runsafely_prefix = ["%s/RunSafely.sh" % config.test_suite_root,
-                                "-t", timeit, timeout, stdin, outfile]
+            runsafely_prefix = [runsafely, "-t", timeit, timeout, stdin,
+                                outfile]
 
             line = " ".join(map(quote, runsafely_prefix + commandline))
             return line