Commit 80c1930c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Be more consistent in printing about framework failures

parent 4084c629
...@@ -142,7 +142,7 @@ for file in t_files: ...@@ -142,7 +142,7 @@ for file in t_files:
t.thread_pool.wait() t.thread_pool.wait()
t.thread_pool.release() t.thread_pool.release()
except: except:
print '*** found an error while executing ', file, ':' print '*** framework failure: found an error while executing ', file, ':'
t.n_framework_failures = t.n_framework_failures + 1 t.n_framework_failures = t.n_framework_failures + 1
traceback.print_exc() traceback.print_exc()
......
...@@ -540,7 +540,7 @@ def do_test(name, way, func, args): ...@@ -540,7 +540,7 @@ def do_test(name, way, func, args):
if getTestOpts().expect != 'pass' and getTestOpts().expect != 'fail' or \ if getTestOpts().expect != 'pass' and getTestOpts().expect != 'fail' or \
result != 'pass' and result != 'fail': result != 'pass' and result != 'fail':
framework_fail(name, way) framework_fail(name, way, 'bad results ' + result)
if result == 'pass': if result == 'pass':
if getTestOpts().expect == 'pass' \ if getTestOpts().expect == 'pass' \
...@@ -573,9 +573,8 @@ def do_test(name, way, func, args): ...@@ -573,9 +573,8 @@ def do_test(name, way, func, args):
else: else:
t.expected_failures[name] = [way] t.expected_failures[name] = [way]
except: except:
print '*** framework failure for', full_name, ':' framework_fail(name, way, 'do_test exception')
traceback.print_exc() traceback.print_exc()
framework_fail(name, way)
def skiptest (name, way): def skiptest (name, way):
# print 'Skipping test \"', name, '\"' # print 'Skipping test \"', name, '\"'
...@@ -585,7 +584,9 @@ def skiptest (name, way): ...@@ -585,7 +584,9 @@ def skiptest (name, way):
else: else:
t.tests_skipped[name] = [way] t.tests_skipped[name] = [way]
def framework_fail( name, way ): def framework_fail( name, way, reason ):
full_name = name + '(' + way + ')'
print '*** framework failure for', full_name, reason, ':'
t.n_framework_failures = t.n_framework_failures + 1 t.n_framework_failures = t.n_framework_failures + 1
if name in t.framework_failures: if name in t.framework_failures:
t.framework_failures[name].append(way) t.framework_failures[name].append(way)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment