From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 18 Mar 2017 00:16:05 +0000 (+0000)
Subject: conformtest: Handle conditional XFAILs with allow-header.
X-Git-Tag: glibc-2.26~689
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22b72f356d6dd6f394cc632d7fbef80490e9f4c4;p=thirdparty%2Fglibc.git

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 7d5bc5d71e4..0862ad09bd7 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 7594f466edc..cb500f0e761 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;