From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX9G2-0005UM-R3 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:47:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX9Fy-0001Ch-QY for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:47:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX9Fy-0001Cb-LE for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:47:54 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 393F43B3C2 for ; Tue, 9 Aug 2016 15:47:54 +0000 (UTC) From: Paolo Bonzini Date: Tue, 9 Aug 2016 17:47:44 +0200 Message-Id: <1470757664-25161-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1470757664-25161-1-git-send-email-pbonzini@redhat.com> References: <1470757664-25161-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] checkpatch: default to success if only warnings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: thuth@redhat.com, armbru@redhat.com, famz@redhat.com, berrange@redhat.com CHK-level checks have been removed from checkpatch or bumped to errors, so there is no effect anymore for --strict/--subjective. Furthermore, even most WARNs have been bumped to errors, with WARN only reserved to things that patchew probably ought not to complain about (and that maintainers probably will notice anyway during review if they are extreme). Default to exiting with success even if there are WARN-level failures, and cause --strict to fail for warnings. Maintainers that want to have a strict 80-character limit for their subsystem can add it to a commit hook for example. The --subjective synonym is removed. Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index cea1997..3701020 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -22,7 +22,7 @@ my $tst_only; my $emacs = 0; my $terse = 0; my $file = 0; -my $check = 0; +my $no_warnings = 0; my $summary = 1; my $mailback = 0; my $summary_file = 0; @@ -45,7 +45,7 @@ Options: --emacs emacs compile window format --terse one line per report -f, --file treat FILE as regular source file - --subjective, --strict enable more subjective tests + --strict fail if only warnings are found --root=PATH PATH to the kernel tree root --no-summary suppress the per-file summary --mailback only produce a report in case of warnings/errors @@ -71,8 +71,7 @@ GetOptions( 'emacs!' => \$emacs, 'terse!' => \$terse, 'f|file!' => \$file, - 'subjective!' => \$check, - 'strict!' => \$check, + 'strict!' => \$no_warnings, 'root=s' => \$root, 'summary!' => \$summary, 'mailback!' => \$mailback, @@ -1072,12 +1071,6 @@ sub WARN { our $cnt_warn++; } } -sub CHK { - if ($check && report("CHECK: $_[0]\n")) { - our $clean = 0; - our $cnt_chk++; - } -} sub process { my $filename = shift; @@ -2590,7 +2583,6 @@ sub process { if ($summary && !($clean == 1 && $quiet == 1)) { print "$filename " if ($summary_file); print "total: $cnt_error errors, $cnt_warn warnings, " . - (($check)? "$cnt_chk checks, " : "") . "$cnt_lines lines checked\n"; print "\n" if ($quiet == 0); } @@ -2613,5 +2605,5 @@ sub process { print "CHECKPATCH in MAINTAINERS.\n"; } - return $clean; + return ($no_warnings ? $clean : $cnt_error == 0); } -- 2.7.4