Making xfail be RE-compatible
This commit is contained in:
parent
a0c0e24079
commit
3454afb790
1 changed files with 15 additions and 1 deletions
|
@ -112,6 +112,12 @@ class DejaResults(object):
|
||||||
self.parse_sum_line(cur_results, line)
|
self.parse_sum_line(cur_results, line)
|
||||||
return cur_results
|
return cur_results
|
||||||
|
|
||||||
|
def transform_re (self, xfails):
|
||||||
|
ret = {}
|
||||||
|
for r in xfails:
|
||||||
|
ret[r] = re.compile (r)
|
||||||
|
return ret
|
||||||
|
|
||||||
# Compute regressions between RESULTS and BASELINE on BUILDER.
|
# Compute regressions between RESULTS and BASELINE on BUILDER.
|
||||||
# BASELINE will be modified if any new PASSes are seen.
|
# BASELINE will be modified if any new PASSes are seen.
|
||||||
# Returns a regression report, as a string.
|
# Returns a regression report, as a string.
|
||||||
|
@ -120,12 +126,20 @@ class DejaResults(object):
|
||||||
our_keys.sort()
|
our_keys.sort()
|
||||||
result = ''
|
result = ''
|
||||||
xfails = self.read_xfail (builder)
|
xfails = self.read_xfail (builder)
|
||||||
|
xfails_re = self.transform_re (xfails)
|
||||||
if xfails is None:
|
if xfails is None:
|
||||||
xfails = {}
|
xfails = {}
|
||||||
for key in our_keys:
|
for key in our_keys:
|
||||||
# An XFAIL entry means we have an unreliable test.
|
# An XFAIL entry means we have an unreliable test.
|
||||||
if key in xfails:
|
cont = False
|
||||||
|
for x in xfails_re:
|
||||||
|
if re.match (xfails_re[x], (key)):
|
||||||
|
cont = True
|
||||||
|
break
|
||||||
|
if cont:
|
||||||
continue
|
continue
|
||||||
|
# if key in xfails:
|
||||||
|
# continue
|
||||||
# A transition to PASS means we should update the baseline.
|
# A transition to PASS means we should update the baseline.
|
||||||
if results[key] == 'PASS':
|
if results[key] == 'PASS':
|
||||||
if key not in baseline or baseline[key] != 'PASS':
|
if key not in baseline or baseline[key] != 'PASS':
|
||||||
|
|
Loading…
Reference in a new issue