From 6bdbca382bfdea2304ef3947c805c9004b096b39 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 28 Aug 2012 11:58:59 +0200 Subject: [PATCH] maintcheck: fix some minor failures * t/lisp-flags.sh: Avoid use of brittle "make -e". * Makefile.am (perf): Don't use $(AM_MAKEFLAGS) when invoking make recursively. * t/dist-obsolete-opts.sh: Make executable. Signed-off-by: Stefano Lattarini --- Makefile.am | 4 ++-- t/dist-obsolete-opts.sh | 0 t/lisp-flags.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 t/dist-obsolete-opts.sh diff --git a/Makefile.am b/Makefile.am index 9455f0f1b..656ebac78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -500,8 +500,8 @@ perf_TESTS = $(wildcard $(srcdir)/t/perf/*.sh) \ $(wildcard $(srcdir)/t/perf/*.tap) .PHONY: perf perf: all - $(MAKE) $(AM_MAKEFLAGS) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' \ - TESTS='$(perf_TESTS)' check + $(MAKE) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' \ + TESTS='$(perf_TESTS)' check PERF_TEST_SUITE_LOG = t/perf/test-suite.log CLEANFILES += $(PERF_TEST_SUITE_LOG) EXTRA_DIST += $(perf_TESTS) diff --git a/t/dist-obsolete-opts.sh b/t/dist-obsolete-opts.sh old mode 100644 new mode 100755 diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh index 1d7d8f3c7..64cb3c900 100755 --- a/t/lisp-flags.sh +++ b/t/lisp-flags.sh @@ -35,7 +35,7 @@ $AUTOMAKE --add-missing ./configure EMACS='echo >$@' --with-lispdir="$(pwd)/unused" : > foo.el -ELCFLAGS='__usr_elcflags__' $MAKE -e +$MAKE ELCFLAGS=__usr_elcflags__ grep '__am_elcflags__.*__usr_elcflags__' foo.elc : -- 2.47.2