F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wutils.py: raise WafError if both --valgrind and --command-template are specified

Browse Source 
even if force_no_valgrind is True, as it is for Python tests
This commit is contained in:
Alexander Krotov
2019-03-20 16:58:01 +03:00
parent 302a462463
commit aa3b2c88cd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wutils.py
View File

@@ -110,9 +110,11 @@ def get_proc_env(os_env=None):
def run_argv(argv, env, os_env=None, cwd=None, force_no_valgrind=False):
proc_env = get_proc_env(os_env)
if Options.options.valgrind and Options.options.command_template:
raise WafError("Options --command-template and --valgrind are conflicting")
if Options.options.valgrind and not force_no_valgrind:
if Options.options.command_template:
raise WafError("Options --command-template and --valgrind are conflicting")
if not env['VALGRIND']:
raise WafError("valgrind is not installed")
# Use the first program found in the env['VALGRIND'] list