This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
conformtest: Handle conditional XFAILs with allow-header [committed]
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Sat, 18 Mar 2017 00:16:38 +0000
- Subject: conformtest: Handle conditional XFAILs with allow-header [committed]
- Authentication-results: sourceware.org; auth=none
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. Committed.
2017-03-18 Joseph Myers <joseph@codesourcery.com>
* conform/conformtest.pl: Handle xfail[cond]- in header mentioned
with allow-header.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 7594f46..cb500f0 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;
--
Joseph S. Myers
joseph@codesourcery.com