From patchwork Sat Mar 18 00:16:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 740560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vlN7C5dFRz9ryQ for ; Sat, 18 Mar 2017 11:16:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="R+R70ruV"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=aaoVAbWQikRS0oUWVnmcekIxg9lGd 7PMwYg2ICvvZRRgo75PjDkdrV3bOjybCHwbwAjclFGL2qUnEA0Ovz1VhorhEEHT3 F38Wnb9bVV+VhsK96O3jO6S/0+A+IVGvwXQ809ITLeu+67Xx2DDFg4K2P57nykiZ DcQ3vpkuCq9FtU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=dRG+OuPwYWu06nWAxCJ4JTmdjHc=; b=R+R 70ruVfmHuxnbBZvWIVu1hAdGQ9EXcpdgFfgt869LqXoGUnvCzfX3AsPm9TXlFHiQ 0wNnZz2dIzFcNwDi9jtZQcBgf6S6N3ewz4FM3VbC4b1xPpqzrHMph+qXW0PSiNmq kzJjkuIaiyNo6kWDBgGUpXdQZ8alvAeGqKJf9JJ0= Received: (qmail 64781 invoked by alias); 18 Mar 2017 00:16:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 64764 invoked by uid 89); 18 Mar 2017 00:16:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:848 X-HELO: relay1.mentorg.com Date: Sat, 18 Mar 2017 00:16:38 +0000 From: Joseph Myers To: Subject: conformtest: Handle conditional XFAILs with allow-header [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) 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 * 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;