lit: Pull a few more variables into the TestingConfig object.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/test/MultiTestRunner.py b/utils/test/MultiTestRunner.py
index 93532eb..00cdfd4 100755
--- a/utils/test/MultiTestRunner.py
+++ b/utils/test/MultiTestRunner.py
@@ -167,14 +167,12 @@
opts = self.provider.opts
startTime = time.time()
code, output = TestRunner.runOneTest(self.provider.config,
- path, base,
- opts.clang, opts.clangcc,
- opts.useValgrind)
+ path, base)
elapsed = time.time() - startTime
except KeyboardInterrupt:
# This is a sad hack. Unfortunately subprocess goes
# bonkers with ctrl-c and we start forking merrily.
- print 'Ctrl-C detected, goodbye.'
+ print '\nCtrl-C detected, goodbye.'
os.kill(0,9)
self.provider.setResult(index, TestResult(path, code, output, elapsed))
@@ -313,6 +311,10 @@
if opts.clangcc is None:
opts.clangcc = TestRunner.inferClangCC(cfg, opts.clang)
+ cfg.clang = opts.clang
+ cfg.clangcc = opts.clangcc
+ cfg.useValgrind = opts.useValgrind
+
# FIXME: It could be worth loading these in parallel with testing.
allTests = list(getTests(cfg, args))
allTests.sort()