From 22b72f356d6dd6f394cc632d7fbef80490e9f4c4 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sat, 18 Mar 2017 00:16:05 +0000 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ conform/conformtest.pl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7d5bc5d..0862ad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-18 Joseph Myers + + * conform/conformtest.pl: Handle xfail[cond]- in header mentioned + with allow-header. + 2017-03-17 Chris Evans * malloc/malloc.c (unlink): Add consistency check between size and 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; -- 2.7.4