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

Interpret regression program non-zero exit as a test failure, instead of showing a traceback.

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2009-01-28 11:01:02 +00:00
parent a9edcf4928
commit c2fd874a0e
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
regression.py
View File

@@ -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