--- a/regression.py Tue Jan 27 14:18:55 2009 +0000
+++ b/regression.py Wed Jan 28 11:01:02 2009 +0000
@@ -122,11 +122,19 @@
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 @@
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