From c2fd874a0e979e9ffca91d7866bcd95ab9536dd2 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 28 Jan 2009 11:01:02 +0000 Subject: [PATCH] Interpret regression program non-zero exit as a test failure, instead of showing a traceback. --- regression.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/regression.py b/regression.py index d92683af1..2e5b7a2d3 100644 --- a/regression.py +++ b/regression.py @@ -122,11 +122,19 @@ class regression_test_task(Task.TaskBase): if is_pyscript: script = os.path.abspath(os.path.join('..', *os.path.split(program))) argv = [self.env['PYTHON'], script] + arguments - wutils.run_argv(argv, cwd=trace_output_path) + try: + wutils.run_argv(argv, cwd=trace_output_path) + except Utils.WafError, ex: + print >> sys.stderr, ex + return 1 else: - wutils.run_program(program, - command_template=wutils.get_command_template(self.env, arguments), - cwd=trace_output_path) + try: + wutils.run_program(program, + command_template=wutils.get_command_template(self.env, arguments), + cwd=trace_output_path) + except Utils.WafError, ex: + print >> sys.stderr, ex + return 1 if Options.options.verbose: #diffCmd = "diff traces " + refTestDirName + " | head" @@ -154,11 +162,19 @@ class regression_test_task(Task.TaskBase): if is_pyscript: script = os.path.abspath(os.path.join('..', *os.path.split(program))) argv = [self.env['PYTHON'], script] + arguments - retval = wutils.run_argv(argv, cwd=trace_output_path) + try: + retval = wutils.run_argv(argv, cwd=trace_output_path) + except Utils.WafError, ex: + print >> sys.stderr, ex + return 1 else: - retval = wutils.run_program(program, - command_template=wutils.get_command_template(self.env, arguments), - cwd=trace_output_path) + try: + retval = wutils.run_program(program, + command_template=wutils.get_command_template(self.env, arguments), + cwd=trace_output_path) + except Utils.WafError, ex: + print >> sys.stderr, ex + return 1 return retval