diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | conform/conformtest.pl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 7d5bc5d71e..0862ad09bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-18 Joseph Myers <joseph@codesourcery.com> + + * conform/conformtest.pl: Handle xfail[cond]- in header mentioned + with allow-header. + 2017-03-17 Chris Evans <scarybeasts@gmail.com> * malloc/malloc.c (unlink): Add consistency check between size and diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 7594f466ed..cb500f0e76 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -810,7 +810,7 @@ while ($#headers >= 0) { next acontrol if (/^#/); next acontrol if (/^[ ]*$/); - s/^xfail-//; + s/^xfail(\[([^\]]*)\])?-//; s/^optional-//; if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) { push @allow, $7; |