From 22b72f356d6dd6f394cc632d7fbef80490e9f4c4 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 18 Mar 2017 00:16:05 +0000
Subject: 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.
---
 conform/conformtest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conform/conformtest.pl')

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;
-- 
cgit 1.4.1