diff options
Diffstat (limited to 'clang/utils/test/MultiTestRunner.py')
| -rwxr-xr-x | clang/utils/test/MultiTestRunner.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clang/utils/test/MultiTestRunner.py b/clang/utils/test/MultiTestRunner.py index 93532ebf64a..00cdfd49368 100755 --- a/clang/utils/test/MultiTestRunner.py +++ b/clang/utils/test/MultiTestRunner.py @@ -167,14 +167,12 @@ class Tester(threading.Thread): 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 @@ def main(): 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() |
