From 42a9c4db8dc4624dc2b59d1f9a3efb45e359c12e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 20 Jun 2011 16:42:10 +0200 Subject: [PATCH] maintcheck: avoid few spurious failures * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl, sc_tests_plain_autoconf, sc_tests_plain_automake, sc_tests_plain_autoupate): Be stricter in matching an erroneous literal command, i.e., `aclocal', `automake', `perl', etc. --- ChangeLog | 8 ++++++++ Makefile.am | 10 +++++----- Makefile.in | 10 +++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d79a848..82aac1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-06-20 Stefano Lattarini + + maintcheck: avoid few spurious failures + * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl, + sc_tests_plain_autoconf, sc_tests_plain_automake, + sc_tests_plain_autoupate): Be stricter in matching an erroneous + literal command, i.e., `aclocal', `automake', `perl', etc. + 2011-06-20 Bert Wesarg (tiny change) check: don't use multi-line coloring for the report diff --git a/Makefile.am b/Makefile.am index b25a30a..9277986 100644 --- a/Makefile.am +++ b/Makefile.am @@ -366,21 +366,21 @@ sc_tests_plain_make: ## Tests should never call autoconf directly. sc_tests_plain_autoconf: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoconf'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoconf\>'; then \ echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF" instead.' 1>&2; \ exit 1; \ fi ## Tests should never call autoupdate directly. sc_tests_plain_autoupdate: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoupdate'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoupdate\>'; then \ echo 'Do not run "autoupdate" in the above tests. Use "$$AUTOUPDATE" instead.' 1>&2; \ exit 1; \ fi ## Tests should never call automake directly. sc_tests_plain_automake: - @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[ ]*automake([^:]|$$)'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[ ]*automake\>([^:]|$$)'; then \ echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE" instead.' 1>&2; \ exit 1; \ fi @@ -420,14 +420,14 @@ sc_tests_automake_fails: ## Tests should never call aclocal directly. sc_tests_plain_aclocal: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*aclocal'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*aclocal\>'; then \ echo 'Do not run "aclocal" in the above tests. Use "$$ACLOCAL" instead.' 1>&2; \ exit 1; \ fi ## Tests should never call perl directly. sc_tests_plain_perl: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*perl'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*perl\>'; then \ echo 'Do not run "perl" in the above tests. Use "$$PERL" instead.' 1>&2; \ exit 1; \ fi diff --git a/Makefile.in b/Makefile.in index 6539f3c..10d57b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1071,19 +1071,19 @@ sc_tests_plain_make: fi sc_tests_plain_autoconf: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoconf'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoconf\>'; then \ echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF" instead.' 1>&2; \ exit 1; \ fi sc_tests_plain_autoupdate: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoupdate'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoupdate\>'; then \ echo 'Do not run "autoupdate" in the above tests. Use "$$AUTOUPDATE" instead.' 1>&2; \ exit 1; \ fi sc_tests_plain_automake: - @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[ ]*automake([^:]|$$)'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[ ]*automake\>([^:]|$$)'; then \ echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE" instead.' 1>&2; \ exit 1; \ fi @@ -1116,13 +1116,13 @@ sc_tests_automake_fails: fi sc_tests_plain_aclocal: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*aclocal'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*aclocal\>'; then \ echo 'Do not run "aclocal" in the above tests. Use "$$ACLOCAL" instead.' 1>&2; \ exit 1; \ fi sc_tests_plain_perl: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*perl'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*perl\>'; then \ echo 'Do not run "perl" in the above tests. Use "$$PERL" instead.' 1>&2; \ exit 1; \ fi -- 2.7.4