From 735d8213ac0d7be959f31d9d1d1b8c7ca7be206c Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 2 Oct 2013 16:11:31 +0000 Subject: [PATCH] don't pass in launcher argument when just building, that only works for unit tests --- tools/run_tests.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/run_tests.py b/tools/run_tests.py index ab5a69c2e..d949c369d 100755 --- a/tools/run_tests.py +++ b/tools/run_tests.py @@ -99,12 +99,19 @@ def run_tests(toolset, tests, features, options, test_dir, time_limit, increment # for l in p.stdout: pass # p.wait() - for t in tests: - cmdline = ['bjam', '--out-xml=%s' % xml_file, '-l%d' % time_limit, '--abbreviate-paths', toolset] + options + feature_list if t != '': cmdline.append(t) - if t == '': t = os.path.split(os.getcwd())[1] -# print ''.join(cmdline) + if t == '': + t = os.path.split(os.getcwd())[1] + # we can't pass in a launcher when just building, that only + # works for actual unit tests + if 'launcher=valgrind' in options: + options = options[:] + options.remove('launcher=valgrind') + cmdline = ['bjam', '--out-xml=%s' % xml_file, '-l%d' % time_limit, '--abbreviate-paths', toolset] + options + feature_list + +# print ' '.join(cmdline) + p = subprocess.Popen(cmdline, stdout=subprocess.PIPE, cwd=test_dir) output = '' for l in p.stdout: