From patchwork Mon May 29 07:42:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 768041 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 3wbpcd4qn4z9s5L for ; Mon, 29 May 2017 17:42:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="XPrzHJUu"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=pBLQo3KGsbCTGNoZWZ+qjt1TotyqRHuFFRryDoZxLEWJg8kVzj c2W0tYxV7sjVwRHmFTuIys/HE2649j6FaSmQOxDzdk/NzKeQYUg5e294h+6MwSwe DQcGvW7dPwpGf4m8aaC09tHZ/6uWUkOyl2TN4lPy7AZfG6i0F3+TSrTY0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=apXjtDhP4GeBFhOn+cAmuKsQAso=; b=XPrzHJUu6cPHG0Wzfimu hiazT0c0q+NE7AaJ3z9L5TobPv5iw1G8tWVdyuZpOor1V6vYSuJaFozSpdloARwl H1FeotLR8tAl2zNZ8C4yGolD+qea31kkEKcc2ivfkY5rsvYUNySBgx90QhDTyOJH zVikcv9a4nLSuDDKm9KkxmQ= Received: (qmail 45629 invoked by alias); 29 May 2017 07:42:41 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 45602 invoked by uid 89); 29 May 2017 07:42:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 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= X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 29 May 2017 07:42:39 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1dFFK5-0005ne-Il from Tom_deVries@mentor.com ; Mon, 29 May 2017 00:42:41 -0700 Received: from [127.0.0.1] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 29 May 2017 08:42:37 +0100 To: =?UTF-8?Q?Martin_Li=c5=a1ka?= CC: GCC Patches From: Tom de Vries Subject: [contrib, committed] check_GNU_style_lib.py: Fix trailing whitespace check Message-ID: Date: Mon, 29 May 2017 09:42:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) Hi, this patch fixes the trailing whitespace check in check_GNU_style_lib.py. Atm, the lines passed to the checks contain the eol char, so the trailing whitespace regexp '(\s+)$' matches for a line '123\n', which is in fact without trailing whitespace. Fixed by removing the eol char. Committed. Thanks, - Tom check_GNU_style_lib.py: Fix trailing whitespace check 2017-05-28 Tom de Vries * check_GNU_style_lib.py (TrailingWhitespaceCheck.check): Assert no trailing eol. (TrailingWhitespaceTest): New unit test. (check_GNU_style_file): Remove eol before checking. --- contrib/check_GNU_style_lib.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/contrib/check_GNU_style_lib.py b/contrib/check_GNU_style_lib.py index e1031df..63d0538 100755 --- a/contrib/check_GNU_style_lib.py +++ b/contrib/check_GNU_style_lib.py @@ -104,6 +104,7 @@ class TrailingWhitespaceCheck: self.re = re.compile('(\s+)$') def check(self, filename, lineno, line): + assert(len(line) == 0 or line[-1] != '\n') m = self.re.search(line) if m != None: return CheckError(filename, lineno, @@ -223,6 +224,18 @@ class LineLengthTest(unittest.TestCase): self.assertEqual(r.console_error, self.check.limit * 'a' + error_string(' = 123;')) +class TrailingWhitespaceTest(unittest.TestCase): + def setUp(self): + self.check = TrailingWhitespaceCheck() + + def test_trailing_whitespace_check_basic(self): + r = self.check.check('foo', 123, 'a = 123;') + self.assertIsNone(r) + r = self.check.check('foo', 123, 'a = 123; ') + self.assertIsNotNone(r) + r = self.check.check('foo', 123, 'a = 123;\t') + self.assertIsNotNone(r) + def check_GNU_style_file(file, file_encoding, format): checks = [LineLengthCheck(), SpacesCheck(), TrailingWhitespaceCheck(), SentenceSeparatorCheck(), SentenceEndOfCommentCheck(), @@ -244,7 +257,8 @@ def check_GNU_style_file(file, file_encoding, format): for line in hunk: if line.is_added and line.target_line_no != None: for check in checks: - e = check.check(t, line.target_line_no, line.value) + line_chomp = line.value.replace('\n', '') + e = check.check(t, line.target_line_no, line_chomp) if e != None: errors.append(e)