diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-03-18 00:16:05 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-03-18 00:16:05 +0000 |
| commit | 22b72f356d6dd6f394cc632d7fbef80490e9f4c4 (patch) | |
| tree | 0ef3ba8c94b7da52498f76457250d620b5e9e086 | |
| parent | 17f487b7afa7cd6c316040f3e6c86dc96b2eec30 (diff) | |
| download | glibc-22b72f356d6dd6f394cc632d7fbef80490e9f4c4.tar.gz glibc-22b72f356d6dd6f394cc632d7fbef80490e9f4c4.tar.xz glibc-22b72f356d6dd6f394cc632d7fbef80490e9f4c4.zip | |
conformtest: Handle conditional XFAILs with allow-header.
This patch fixes the conformtest handling of headers listed in allow-header to process xfail[cond]- in the expectations for those headers. Tested with build-many-glibcs.py. * conform/conformtest.pl: Handle xfail[cond]- in header mentioned with allow-header.
| -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; |