This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.25-136-g22b72f3


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  22b72f356d6dd6f394cc632d7fbef80490e9f4c4 (commit)
      from  17f487b7afa7cd6c316040f3e6c86dc96b2eec30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=22b72f356d6dd6f394cc632d7fbef80490e9f4c4

commit 22b72f356d6dd6f394cc632d7fbef80490e9f4c4
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Sat Mar 18 00:16:05 2017 +0000

    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 7d5bc5d..0862ad0 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 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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    5 +++++
 conform/conformtest.pl |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]