diff options
Diffstat (limited to 'utils/test/MultiTestRunner.py')
| -rwxr-xr-x | utils/test/MultiTestRunner.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/test/MultiTestRunner.py b/utils/test/MultiTestRunner.py index 04bd74f65d..8b48d8d6c7 100755 --- a/utils/test/MultiTestRunner.py +++ b/utils/test/MultiTestRunner.py @@ -236,7 +236,7 @@ def main(): action="store_true", default=False) parser.add_option("", "--path", dest="path", help="Additional paths to add to testing environment", - action="store", type=str, default=None) + action="append", type=str, default=[]) (opts, args) = parser.parse_args() @@ -246,6 +246,10 @@ def main(): parser.error('Support for running with valgrind is ' 'temporarily disabled') + # FIXME: Move into configuration object. + TestRunner.kChildEnv["PATH"] = os.pathsep.join(opts.path + + [TestRunner.kChildEnv['PATH']]) + if opts.clang is None: opts.clang = TestRunner.inferClang() if opts.clangcc is None: @@ -266,9 +270,7 @@ def main(): random.shuffle(tests) if opts.maxTests is not None: tests = tests[:opts.maxTests] - if opts.path is not None: - os.environ["PATH"] = opts.path + ":" + os.environ["PATH"]; - + extra = '' if len(tests) != len(allTests): extra = ' of %d'%(len(allTests),) |