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.

diff --git a/ChangeLog b/ChangeLog
index 7d5bc5d71e4d92137f7e7c83a685f6fc89560070..0862ad09bd774a762fe93411e84c2d333e883a33 100644 (file)
--- 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 7594f466edcdd26774821bc0dd9aae438e53e7e7..cb500f0e761821723af6e4b93f33acecea5d59fe 100644 (file)
--- 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;