[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-ng] [FYI] [ng] maintcheck: fix real and spurious warnings
From: |
Stefano Lattarini |
Subject: |
[Automake-ng] [FYI] [ng] maintcheck: fix real and spurious warnings |
Date: |
Tue, 31 Jan 2012 11:22:01 +0100 |
* tests/conffile-leading-dot.test ($required): Remove "GNUmake".
* tests/gmake-vars.test: Use 'AUTOMAKE_run' instead of redirecting
the automake stderr by hand. Use "$MAKE", not bare "make".
* Makefile.am, doc/Makefile.am, tests/Makefile.am,
contrib/check-html.am: Don't use '$(AM_MAKEFLAGS)' in recursive
make invocations.
---
Makefile.am | 13 ++++++-------
contrib/check-html.am | 4 ++--
doc/Makefile.am | 4 ++--
tests/Makefile.am | 2 +-
tests/conffile-leading-dot.test | 1 -
tests/gmake-vars.test | 5 +++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f1d59bc..868253f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,11 +106,11 @@ INSTALL: lib/INSTALL
# Run the testsuite with the installed aclocal and automake.
installcheck-local:
- am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+ am_running_installcheck=yes $(MAKE) check
# Convenience proxy target for the test suites.
recheck:
- $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
+ $(am__cd) tests && $(MAKE) $@
.PHONY: recheck
################################################################
@@ -171,7 +171,7 @@ check-coverage-run recheck-coverage-run: all
$(mkinstalldirs) $(PERL_COVERAGE_DB)
PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
- $(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed 's/-coverage-run//'`
+ $(MAKE) `echo $@ | sed 's/-coverage-run//'`
check-coverage-report:
@if test ! -d "$(PERL_COVERAGE_DB)"; then \
@@ -184,10 +184,9 @@ check-coverage-report:
# We don't use direct dependencies here because we'd like to be able
# to invoke the report even after interrupted check-coverage.
check-coverage: check-coverage-run
- $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
-
+ $(MAKE) check-coverage-report
recheck-coverage: recheck-coverage-run
- $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
+ $(MAKE) check-coverage-report
clean-coverage:
rm -rf "$(PERL_COVERAGE_DB)"
@@ -251,7 +250,7 @@ git-upload-release:
&& case $$tag in "v$(VERSION)") true;; *) false;; esac \
|| fatal "you can only create a release from a tagged version"; \
## Build and upload the distribution tarball(s).
- $(MAKE) $(AM_MAKEFLAGS) dist || exit 1; \
+ $(MAKE) dist || exit 1; \
echo Will upload to $$dest: $(DIST_ARCHIVES); \
$(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest $(DIST_ARCHIVES)
diff --git a/contrib/check-html.am b/contrib/check-html.am
index 1526976..7ddd948 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -49,10 +49,10 @@ mostlyclean-check-html:
# And expect check to fail.
check-html recheck-html:
@target=`echo $@ | sed 's/-html$$//'`; \
- rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
+ rv=0; $(MAKE) $$target || rv=$$?; \
## The nullification of $(TEST_LOGS) is required to ensure that
## "make recheck-html" do not try to uselessly re-run tests.
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
+ $(MAKE) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
exit $$rv
.PHONY: check-html recheck-html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a2dde22..71c7a6a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -84,7 +84,7 @@ $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources)
$(top_srcdir)/configure.ac
AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \
$(am_AUTORECONF) -vfi && \
./configure && \
- $(MAKE) $(AM_MAKEFLAGS) distcheck && \
- $(MAKE) $(AM_MAKEFLAGS) distclean && \
+ $(MAKE) distcheck && \
+ $(MAKE) distclean && \
rm -rf $(amhello_configury) && \
mv amhello-1.0.tar.gz ..
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9381f26..f635d12 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -195,7 +195,7 @@ include $(srcdir)/CheckListOfTests.am
# Run the testsuite with the installed aclocal and automake.
installcheck-local:
- am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+ am_running_installcheck=yes $(MAKE) check
clean-local: clean-local-check
.PHONY: clean-local-check
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index 1d3d12f..d1306be 100755
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -18,7 +18,6 @@
# with a dot (like "./Makefile"), since the remake rules might be subtly
# broken in that case.
-required=GNUmake
. ./defs || Exit 1
set -e
diff --git a/tests/gmake-vars.test b/tests/gmake-vars.test
index 7c5ca00..5c52df3 100755
--- a/tests/gmake-vars.test
+++ b/tests/gmake-vars.test
@@ -71,7 +71,8 @@ END
echo AC_OUTPUT >> configure.in
$ACLOCAL
-$AUTOMAKE 2>stderr && test ! -s stderr || { cat stderr >&2; Exit 1; }
+AUTOMAKE_run
+test ! -s stderr
: > foo.sh
: > bar.sh
@@ -79,6 +80,6 @@ $AUTOMAKE 2>stderr && test ! -s stderr || { cat stderr >&2;
Exit 1; }
$AUTOCONF
./configure
-make 'do/test'
+$MAKE 'do/test'
:
--
1.7.7.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-ng] [FYI] [ng] maintcheck: fix real and spurious warnings,
Stefano Lattarini <=