From patchwork Mon Jul 27 14:15:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 7866 Received: (qmail 121559 invoked by alias); 27 Jul 2015 14:15:16 -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 121548 invoked by uid 89); 27 Jul 2015 14:15:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: Fix spurious conform test failures X-Yow: I want to dress you up as TALLULAH BANKHEAD and cover you with VASELINE and WHEAT THINS.. Date: Mon, 27 Jul 2015 16:15:09 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 String literals in the preprocessor output causes spurious test failures because the tokenizer doesn't know how to skip over them, for example: Checking the namespace of "arpa/inet.h"... FAIL ------------------------------------------------------------------ Namespace violation: "d" Namespace violation: "ror" Namespace violation: "swap" Namespace violation: "w" ------------------------------------------------------------------ Installed as obvious. Andreas. * conform/conformtest.pl (checknamespace): Filter out string literals while tokenizing. --- conform/conformtest.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conform/conformtest.pl b/conform/conformtest.pl index a8a27f5..cc0944a 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -275,9 +275,8 @@ sub checknamespace { } else { # We have to tokenize the line. my($str) = $_; - my($index) = 0; - my($len) = length ($str); + $str =~ s/"[^"]*"//g; foreach $token (split(/[^a-zA-Z0-9_]/, $str)) { if ($token ne "") { newtoken ($token, @allow);