[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/7] build: require Automake >= 1.11.6
From: |
Jim Meyering |
Subject: |
Re: [PATCH 3/7] build: require Automake >= 1.11.6 |
Date: |
Fri, 31 Aug 2012 10:16:44 +0200 |
Bernhard Voelker wrote:
...
> After finally getting autoconf+autmake working (and running bootstrap
> etc in coreutils), a `make syntax-check` failed because of the
Thanks for the quick work and sorry I forgot to run
"make syntax-check" before pushing that.
> renaming of the test scripts.
> The attached patch silenced the syntax-check (although I'm not sure if
> I fixed sc_long_lines in the right way).
...
> diff --git a/cfg.mk b/cfg.mk
...
> - \|^[^:]*tests/misc/sha[0-9]*sum[-:]| d; \
> + \|^[^:]*tests/misc/sha[0-9]*sum[^:]| d; \
> \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
I've adjusted the above, since we really do want to require
either ":" or "-" (file name delimiters in grep output):
- \|^[^:]*tests/misc/sha[0-9]*sum[^:]| d; \
+ \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \
> @files=$$($(VC_LIST_EXCEPT)) \
> @@ -501,7 +501,7 @@ update-copyright-env = \
>
> # List syntax-check exemptions.
> exclude_file_name_regexp--sc_space_tab = \
> - ^(tests/pr/|tests/misc/nl$$|gl/.*\.diff$$)
> + ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$)
> exclude_file_name_regexp--sc_bindtextdomain =
> ^(gl/.*|lib/euidaccess-stat)\.c$$
> exclude_file_name_regexp--sc_unmarked_diagnostics = ^build-aux/cvsu$$
> exclude_file_name_regexp--sc_error_message_uppercase = ^build-aux/cvsu$$
> @@ -521,7 +521,7 @@
> exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
> exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/
> exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$
> exclude_file_name_regexp--sc_file_system = \
> - NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P)$$
> + NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P.sh)$$
I inserted a backslash here:
+ NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P\.sh)$$
I wrote the commit log for you, too.
Here's the result. I'll wait for your ACK:
>From c1c92bcb29b95970a81c34a1f7354f39b6d942b4 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <address@hidden>
Date: Fri, 31 Aug 2012 10:07:54 +0200
Subject: [PATCH] build: fix syntax-check rules broken by test-added .sh/pl
suffixes
* cfg.mk: We exempt a few test files that would otherwise trigger
false-positive matches in syntax-check rules. The recent change
that added a .sh or .pl suffix to each test script made it so
some of the exclusion regexps would no longer match.
Include the required \.sh suffix in each such regexp, too.
---
cfg.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 50fb13e..44a43f8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -156,7 +156,7 @@ sc_check-AUTHORS:
LINE_LEN_MAX = 80
FILTER_LONG_LINES = \
/^[^:]*\.diff:[^:]*:@@ / d; \
- \|^[^:]*tests/misc/sha[0-9]*sum[-:]| d; \
+ \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \
\|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
sc_long_lines:
@files=$$($(VC_LIST_EXCEPT)) \
@@ -501,7 +501,7 @@ update-copyright-env = \
# List syntax-check exemptions.
exclude_file_name_regexp--sc_space_tab = \
- ^(tests/pr/|tests/misc/nl$$|gl/.*\.diff$$)
+ ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$)
exclude_file_name_regexp--sc_bindtextdomain = ^(gl/.*|lib/euidaccess-stat)\.c$$
exclude_file_name_regexp--sc_unmarked_diagnostics = ^build-aux/cvsu$$
exclude_file_name_regexp--sc_error_message_uppercase = ^build-aux/cvsu$$
@@ -521,7 +521,7 @@ exclude_file_name_regexp--sc_prohibit_always-defined_macros
= \
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/
exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$
exclude_file_name_regexp--sc_file_system = \
- NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P)$$
+ NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P\.sh)$$
exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
^m4/stat-prog\.m4$$
exclude_file_name_regexp--sc_prohibit_fail_0 = \
@@ -536,13 +536,13 @@
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
exclude_file_name_regexp--sc_preprocessor_indentation = \
^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$
exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \
- ^(src/system\.h|tests/du/2g)$$
+ ^(src/system\.h|tests/du/2g\.sh)$$
exclude_file_name_regexp--sc_prohibit_continued_string_alpha_in_column_1 = \
^src/(system\.h|od\.c|printf\.c)$$
exclude_file_name_regexp--sc_prohibit_test_backticks = \
- ^tests/(init\.sh|check\.mk|misc/stdbuf)$$
+ ^tests/(init\.sh|Makefile\.am|misc/stdbuf\.sh)$$
# Exempt test.c, since it's nominally shared, and relatively static.
exclude_file_name_regexp--sc_prohibit_operator_at_end_of_line = \
--
1.7.12.146.g16d26b1
- Re: [PATCH 4/7] tests: avoid use of '-T' in shebang line to enable perl taint mode, (continued)
[PATCH 7/7] tests: get rid of the 'shell-or-perl' auxiliary script, Stefano Lattarini, 2012/08/30
[PATCH 3/7] build: require Automake >= 1.11.6, Stefano Lattarini, 2012/08/30
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Jim Meyering, 2012/08/30
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Bernhard Voelker, 2012/08/30
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Jim Meyering, 2012/08/31
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Bernhard Voelker, 2012/08/31
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Stefano Lattarini, 2012/08/31
- Re: [PATCH 3/7] build: require Automake >= 1.11.6,
Jim Meyering <=
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Bernhard Voelker, 2012/08/31
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Jim Meyering, 2012/08/31
- Re: [PATCH 3/7] build: require Automake >= 1.11.6, Bernhard Voelker, 2012/08/31
Re: [PATCH 3/7] build: require Automake >= 1.11.6, Erik Auerswald, 2012/08/31
Re: [PATCH 3/7] build: require Automake >= 1.11.6, Jim Meyering, 2012/08/31
[PATCH 5/7] tests: detect missing perl at configure runtime, Stefano Lattarini, 2012/08/30
[PATCH 6/7] tests: add .sh and .pl suffixes to shell and perl tests, respectively, Stefano Lattarini, 2012/08/30