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.
This commit is contained in:
Joseph Myers 2017-03-18 00:16:05 +00:00
parent 17f487b7af
commit 22b72f356d
2 changed files with 6 additions and 1 deletions

View File

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

View File

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