From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 5/7] Makefile: add 'check-sort' target
Date: Mon, 15 Mar 2021 17:56:24 -0700 [thread overview]
Message-ID: <5088e93d76e44de9d079b7b2296b8c810828a2f5.1615856156.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1615856156.git.liu.denton@gmail.com>
In the previous few commits, we sorted many lists into ASCII-order. In
order to ensure that they remain that way, add the 'check-sort' target.
The check-sort.perl program ensures that consecutive lines that match
the same regex are sorted in ASCII-order. The 'check-sort' target runs
the check-sort.perl program on some files which are known to contain
sorted lists.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
Notes:
Full disclaimer: this is the first time I've written anything in Perl.
Please let me know if I'm doing anything unconventional :)
Makefile | 25 +++++++++++++++++++++++++
check-sort.perl | 31 +++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100755 check-sort.perl
diff --git a/Makefile b/Makefile
index 5832aa33da..b23dff384d 100644
--- a/Makefile
+++ b/Makefile
@@ -3240,6 +3240,31 @@ check-docs::
check-builtins::
./check-builtins.sh
+.PHONY: check-sort
+check-sort::
+ ./check-sort.perl \
+ 'ALL_COMMANDS \+=' \
+ 'ALL_COMMANDS_TO_INSTALL \+=' \
+ 'BINDIR_PROGRAMS_NEED_X \+=' \
+ 'BINDIR_PROGRAMS_NO_X \+=' \
+ 'BUILTIN_OBJS \+=' \
+ 'BUILT_INS \+=' \
+ 'FUZZ_OBJS \+=' \
+ 'GENERATED_H \+=' \
+ 'LIB_OBJS \+=' \
+ 'SCRIPT_LIB \+=' \
+ 'SCRIPT_PERL \+=' \
+ 'SCRIPT_PYTHON \+=' \
+ 'SCRIPT_SH \+=' \
+ 'TEST_BUILTINS_OBJS \+=' \
+ 'TEST_PROGRAMS_NEED_X \+=' \
+ 'THIRD_PARTY_SOURCES \+=' \
+ 'XDIFF_OBJS \+=' \
+ <Makefile
+ ./check-sort.perl 'int cmd_[^(]*\(' <builtin.h
+ ./check-sort.perl 'int cmd__[^(]*\(' <t/helper/test-tool.h
+ ./check-sort.perl '\t\{ "[^"]*",' <git.c
+
### Test suite coverage testing
#
.PHONY: coverage coverage-clean coverage-compile coverage-test coverage-report
diff --git a/check-sort.perl b/check-sort.perl
new file mode 100755
index 0000000000..cd723db14d
--- /dev/null
+++ b/check-sort.perl
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my @regexes = map { qr/^$_/ } @ARGV;
+my $last_regex = 0;
+my $last_line = '';
+
+while (<STDIN>) {
+ my $matched = 0;
+ chomp;
+
+ for my $regex (@regexes) {
+ next unless $_ =~ $regex;
+
+ if ($last_regex == $regex) {
+ die "duplicate lines: '$_'\n" unless $last_line ne $_;
+ die "unsorted lines: '$last_line' before '$_'\n" unless $last_line lt $_;
+ }
+
+ $matched = 1;
+ $last_regex = $regex;
+ $last_line = $_;
+ }
+
+ unless ($matched) {
+ $last_regex = 0;
+ $last_line = '';
+ }
+}
--
2.31.0.rc2.261.g7f71774620
next prev parent reply other threads:[~2021-03-16 0:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 0:56 [PATCH 0/7] Sort lists and add static-analysis Denton Liu
2021-03-16 0:56 ` [PATCH 1/7] Makefile: mark 'check-builtins' as a .PHONY target Denton Liu
2021-03-16 4:59 ` Eric Sunshine
2021-03-17 17:47 ` Junio C Hamano
2021-03-16 0:56 ` [PATCH 2/7] Makefile: ASCII-sort LIB_OBJS Denton Liu
2021-03-16 0:56 ` [PATCH 3/7] builtin.h: ASCII-sort list of functions Denton Liu
2021-03-17 17:51 ` Junio C Hamano
2021-03-16 0:56 ` [PATCH 4/7] test-tool.h: " Denton Liu
2021-03-17 17:54 ` Junio C Hamano
2021-03-16 0:56 ` Denton Liu [this message]
2021-03-16 6:37 ` [PATCH 5/7] Makefile: add 'check-sort' target Eric Sunshine
2021-03-17 9:50 ` Denton Liu
2021-03-17 12:47 ` Ævar Arnfjörð Bjarmason
2021-03-17 17:32 ` Jeff King
2021-03-17 17:42 ` Ævar Arnfjörð Bjarmason
2021-03-17 21:48 ` Eric Sunshine
2021-03-17 22:01 ` Jeff King
2021-03-17 18:01 ` Junio C Hamano
2021-03-17 18:16 ` Ævar Arnfjörð Bjarmason
2021-03-17 17:59 ` Junio C Hamano
2021-03-16 0:56 ` [PATCH 6/7] ci/run-static-analysis.sh: make check-builtins Denton Liu
2021-03-16 0:56 ` [PATCH 7/7] ci/run-static-analysis.sh: make check-sort Denton Liu
2021-03-17 11:01 ` [PATCH 0/7] Sort lists and add static-analysis Bagas Sanjaya
2021-03-17 18:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5088e93d76e44de9d079b7b2296b8c810828a2f5.1615856156.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).