From ba5c9355f6008919a9428036357f5d9b867dbaed Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 21 Apr 2009 11:13:19 +0100 Subject: [PATCH] Force valgrind to not be used for Python tests --- regression.py | 4 ++-- wscript | 3 ++- wutils.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/regression.py b/regression.py index 653731cc5..4ec4fba85 100644 --- a/regression.py +++ b/regression.py @@ -159,7 +159,7 @@ class regression_test_task(Task.TaskBase): script = os.path.abspath(os.path.join('..', *os.path.split(program))) argv = [self.env['PYTHON'], script] + arguments try: - wutils.run_argv(argv, self.env, cwd=trace_output_path) + wutils.run_argv(argv, self.env, cwd=trace_output_path, force_no_valgrind=True) except Utils.WafError, ex: print >> sys.stderr, ex return 1 @@ -191,7 +191,7 @@ class regression_test_task(Task.TaskBase): script = os.path.abspath(os.path.join('..', *os.path.split(program))) argv = [self.env['PYTHON'], script] + arguments try: - retval = wutils.run_argv(argv, self.env, cwd=trace_output_path) + retval = wutils.run_argv(argv, self.env, cwd=trace_output_path, force_no_valgrind=True) except Utils.WafError, ex: print >> sys.stderr, ex return 1 diff --git a/wscript b/wscript index 255804d93..0b91d8a67 100644 --- a/wscript +++ b/wscript @@ -525,7 +525,8 @@ def check(bld): if env['ENABLE_PYTHON_BINDINGS']: print "-- Running NS-3 Python bindings unit tests..." - wutils.run_argv([env['PYTHON'], os.path.join("utils", "python-unit-tests.py")], env, proc_env) + wutils.run_argv([env['PYTHON'], os.path.join("utils", "python-unit-tests.py")], + env, proc_env, force_no_valgrind=True) else: print "-- Skipping NS-3 Python bindings unit tests: Python bindings not enabled." diff --git a/wutils.py b/wutils.py index d82fe305d..094c82322 100644 --- a/wutils.py +++ b/wutils.py @@ -114,9 +114,9 @@ def get_proc_env(os_env=None): return proc_env -def run_argv(argv, env, os_env=None, cwd=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: + if Options.options.valgrind and not force_no_valgrind: if Options.options.command_template: raise Utils.WafError("Options --command-template and --valgrind are conflicting") if not env['VALGRIND']: