From: Stefano Lattarini Date: Mon, 20 Jun 2011 14:58:22 +0000 (+0200) Subject: maintcheck: avoid few spurious failures X-Git-Tag: ng-0.5a~89^2~181 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1429b5682e4c42eda02a884a4d6243ec3b042c5b;p=thirdparty%2Fautomake.git maintcheck: avoid few spurious failures * tests/depmod-data.test: Use creative quoting to avoid spuriously triggering the `sc_tests_Exit_not_exit' maintainer check. Commit `v1.11-900-g3453b8e' attempted to fix it, but succeeded only partially. * tests/cond33.test: Fix header comments, not to reference obsolescent make variable `$(mkdir_p)'. * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e", to please `sc_tests_overriding_macros_on_cmdline' * tests/cond19.test: Likewise. * tests/cond32.test: Likewise. * tests/add-missing.test: Use "AUTOMAKE_fails" instead of "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'. --- diff --git a/ChangeLog b/ChangeLog index 1a5c4aac6..e1a774c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2011-06-20 Stefano Lattarini + + maintcheck: avoid few more spurious failures + * tests/depmod-data.test: Use creative quoting to avoid + spuriously triggering the `sc_tests_Exit_not_exit' maintainer + check. Commit `v1.11-900-g3453b8e' attempted to fix it, but + succeeded only partially. + * tests/cond33.test: Fix header comments, not to reference + obsolescent make variable `$(mkdir_p)'. + * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e", + to please `sc_tests_overriding_macros_on_cmdline' + * tests/cond19.test: Likewise. + * tests/cond32.test: Likewise. + * tests/add-missing.test: Use "AUTOMAKE_fails" instead of + "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'. + 2011-06-20 Bert Wesarg (tiny change) check: don't use multi-line coloring for the report diff --git a/tests/add-missing.test b/tests/add-missing.test index d6729f376..7e3d08c4a 100755 --- a/tests/add-missing.test +++ b/tests/add-missing.test @@ -141,8 +141,7 @@ check_ () # If the required auxiliary files are missing, and automake is # not told to install them, it should complain and error out, # and also give a useful suggestion. - $AUTOMAKE 2>stderr && { cat stderr >&2; Exit 1; } - cat stderr >&2 + AUTOMAKE_fails for f in $files; do grep "required file ['\`]$build_aux/$f' not found" stderr # Suggest the user to use `--add-missing'. diff --git a/tests/cond19.test b/tests/cond19.test index 50ae9cbb9..ec69bfbb8 100755 --- a/tests/cond19.test +++ b/tests/cond19.test @@ -60,12 +60,12 @@ $AUTOCONF $AUTOMAKE -a -i CONDITION1=true CONDITION2=true ./configure -$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' +exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' $MAKE -e test CONDITION1=true CONDITION2=false ./configure -$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' +exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' $MAKE -e test CONDITION1=false CONDITION2=true ./configure -$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' +exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' $MAKE -e test CONDITION1=false CONDITION2=false ./configure -$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' +exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' $MAKE -e test : diff --git a/tests/cond32.test b/tests/cond32.test index 30fde1151..45ecf7096 100755 --- a/tests/cond32.test +++ b/tests/cond32.test @@ -61,12 +61,12 @@ $AUTOCONF $AUTOMAKE ./configure -$MAKE test exp='foo.o nonsense.a' +exp='foo.o nonsense.a' $MAKE -e test ./configure two=yes three= -$MAKE test exp='bar.o' +exp='bar.o' $MAKE -e test ./configure two=yes three=yes -$MAKE test exp='baz.o' +exp='baz.o' $MAKE -e test : diff --git a/tests/cond33.test b/tests/cond33.test index 149795d49..5f454dbcc 100755 --- a/tests/cond33.test +++ b/tests/cond33.test @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check that $(mkdir_p) handles well conditionally-defined install -# directories. +# Check that conditionally-defined install directories are handled +# correctly. # Report from Ralf Corsepius . ./defs || Exit 1 diff --git a/tests/cond4.test b/tests/cond4.test index 7d2aaea3e..307157754 100755 --- a/tests/cond4.test +++ b/tests/cond4.test @@ -57,12 +57,12 @@ grep '^@TWO_FALSE@' Makefile.in && Exit 1 $AUTOCONF CONDITION1=true CONDITION2=true ./configure -$MAKE test exp='main.o one.o two.o' +exp='main.o one.o two.o' $MAKE -e test CONDITION1=true CONDITION2=false ./configure -$MAKE test exp='main.o one.o' +exp='main.o one.o' $MAKE -e test CONDITION1=false CONDITION2=true ./configure -$MAKE test exp='main.o two.o' +exp='main.o two.o' $MAKE -e test CONDITION1=false CONDITION2=false ./configure -$MAKE test exp='main.o' +exp='main.o' $MAKE -e test : diff --git a/tests/depmod-data.test b/tests/depmod-data.test index 18c26ebd5..297c73955 100755 --- a/tests/depmod-data.test +++ b/tests/depmod-data.test @@ -20,7 +20,7 @@ # Ensure proper definition of $testsrcdir. # FIXME: we employ useless quoting below to please maintainer-check. -. ./defs-static || exit 99 +. ./defs-static || 'exit' 99 # Sanity check. if test x"$testsrcdir" = x; then