The 'sc_tests_makefile_variable_order' maintainer check is too strict sometimes, blaming automake for outputting out-of-order variables when this is in fact due to the result of post-processing of third-party tools or custom test code.
* t/tap-doc2.sh: Ensure the final Makefile.in (that we hack by hand) is removed, to avoid a spurious maintainer-check failure. * t/gettext-macros.sh: Ensure that any leftover Makefile.in (that is generated by gettext/autopoint) is removed, to avoid a spurious maintainer-check failure. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- t/gettext-macros.sh | 4 ++++ t/tap-doc2.sh | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index 38749d3..8adcb0d 100755 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -86,6 +86,10 @@ $ACLOCAL --force -I m4 || cat >> get.sh <<'END' ACLOCAL="$ACLOCAL -Wno-syntax" END +# Remove any Makefile.in possibly created by gettextize/autopoint, to +# avoid spurious maintainer-check failures. +rm -f `find . -name Makefile.in` + # The file gettextize or autopoint might have copied in the 'm4' # subdirectory of the test directory are going to be needed by # other tests, so we must not remove the test directory. diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh index 76e1ade..2232712 100755 --- a/t/tap-doc2.sh +++ b/t/tap-doc2.sh @@ -137,4 +137,6 @@ echo AM_TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile.in ./config.status Makefile $MAKE distcheck +rm -f Makefile.in # To avoid a maintainer-check failure. + : -- 1.7.9
