From: Stefano Lattarini Date: Tue, 27 Apr 2010 12:33:14 +0000 (+0200) Subject: Enable `errexit' shell flag in various tests. X-Git-Tag: v1.11.1b~80^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d18bf57de4f2bfccf89bda9aecd3ed2440671328;p=thirdparty%2Fautomake.git Enable `errexit' shell flag in various tests. * tests/acoutnoq.test: Enabled `errexit' shell flag, and related minor changes. * tests/acoutpt.test: Likewise. * tests/acoutqnl.test: Likewise. * tests/amassign.test: Likewise. * tests/ansi2.test: Likewise. * tests/ansi4.test: Likewise. * tests/badprog.test: Likewise. * tests/checkall.test: Likewise. * tests/clean.test: Likewise. * tests/colneq2.test: Likewise. * tests/colon.test: Likewise. * tests/colon5.test: Likewise. * tests/colon6.test: Likewise. * tests/comment.test: Likewise. * tests/compile_f90_c_cxx.test: Likewise. * tests/compile_f_c_cxx.test: Likewise. * tests/cond3.test: Likewise. * tests/cond6.test: Likewise. * tests/cond13.test: Likewise. * tests/conf2.test: Likewise. * tests/confvar.test: Likewise. * tests/confvar2.test: Likewise. * tests/cond8.test: Likewise, plus a cosmetic change. * tests/confh4.test: Likewise. Also, add in the heading comments an excerpt from the original bug report which motivated the creation of this test, to make its purpose clearer. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 653c42104..69a89ff4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2010-06-06 Stefano Lattarini + + Enable `errexit' shell flag in various tests. + * tests/acoutnoq.test: Enabled `errexit' shell flag, and related + minor changes. + * tests/acoutpt.test: Likewise. + * tests/acoutqnl.test: Likewise. + * tests/amassign.test: Likewise. + * tests/ansi2.test: Likewise. + * tests/ansi4.test: Likewise. + * tests/badprog.test: Likewise. + * tests/checkall.test: Likewise. + * tests/clean.test: Likewise. + * tests/colneq2.test: Likewise. + * tests/colon.test: Likewise. + * tests/colon5.test: Likewise. + * tests/colon6.test: Likewise. + * tests/comment.test: Likewise. + * tests/compile_f90_c_cxx.test: Likewise. + * tests/compile_f_c_cxx.test: Likewise. + * tests/cond3.test: Likewise. + * tests/cond6.test: Likewise. + * tests/cond13.test: Likewise. + * tests/conf2.test: Likewise. + * tests/confvar.test: Likewise. + * tests/confvar2.test: Likewise. + * tests/cond8.test: Likewise, plus a cosmetic change. + * tests/confh4.test: Likewise. Also, add in the heading comments + an excerpt from the original bug report which motivated the + creation of this test, to make its purpose clearer. + 2010-06-06 Ralf Wildenhues Rewrite manual to be gender-neutral. diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test index b7bb61609..344905f74 100755 --- a/tests/acoutnoq.test +++ b/tests/acoutnoq.test @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,6 +23,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -30,5 +33,5 @@ END : > Makefile.am -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/acoutpt.test b/tests/acoutpt.test index b0e44ee64..e18e4e449 100755 --- a/tests/acoutpt.test +++ b/tests/acoutpt.test @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +20,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -27,5 +30,5 @@ END : > Makefile.am -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test index 70c5cbc04..75736f2eb 100755 --- a/tests/acoutqnl.test +++ b/tests/acoutqnl.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -27,6 +30,5 @@ END : > Makefile.am -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE - diff --git a/tests/amassign.test b/tests/amassign.test index 3e411c889..af098d21a 100755 --- a/tests/amassign.test +++ b/tests/amassign.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AM_CFLAGS=foo AC_SUBST(AM_BAR) diff --git a/tests/ansi2.test b/tests/ansi2.test index c0409a32f..77ca2c616 100755 --- a/tests/ansi2.test +++ b/tests/ansi2.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = ansi2knr bin_PROGRAMS = joe @@ -31,7 +34,7 @@ END : > ansi2knr.c : > ansi2knr.1 -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in diff --git a/tests/ansi4.test b/tests/ansi4.test index baff19a6a..63250a9ec 100755 --- a/tests/ansi4.test +++ b/tests/ansi4.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002, 2008 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2008, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CC AM_C_PROTOTYPES @@ -33,7 +36,7 @@ END : > ansi2knr.c : > hello.c -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE -$FGREP 'ansi2knr.$(' Makefile.in || Exit 1 +$FGREP 'ansi2knr.$(' Makefile.in diff --git a/tests/badprog.test b/tests/badprog.test index b8d45e938..7a31b3ff7 100755 --- a/tests/badprog.test +++ b/tests/badprog.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CC END @@ -28,5 +30,5 @@ bin_PROGRAMS = a,b a_b_SOURCES = ab.c END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/checkall.test b/tests/checkall.test index 4e7388be6..7dff8fc18 100755 --- a/tests/checkall.test +++ b/tests/checkall.test @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,14 +19,16 @@ . ./defs || Exit 1 +set -e + cat > Makefile.am << 'END' bin_SCRIPTS = derived check-local: true END -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE -grep '^check-am:.*all-am' Makefile.in || Exit 1 +grep '^check-am:.*all-am' Makefile.in grep 'MAKE.*check-local' Makefile.in diff --git a/tests/clean.test b/tests/clean.test index df1c16822..23ab2acfc 100755 --- a/tests/clean.test +++ b/tests/clean.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,11 @@ . ./defs || Exit 1 +set -e + : > Makefile.am -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep '^clean-am:.*mostlyclean-am' Makefile.in diff --git a/tests/colneq2.test b/tests/colneq2.test index bca83ce95..e454c4675 100755 --- a/tests/colneq2.test +++ b/tests/colneq2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ . ./defs || Exit 1 +set -e + cat > Makefile.am << 'END' t = a b c EXTRA_DIST = $(t:=.test) @@ -27,5 +29,5 @@ END : > b.test : > c.test -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/colon.test b/tests/colon.test index 2fd0538a3..da7a9da3e 100755 --- a/tests/colon.test +++ b/tests/colon.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +20,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -29,5 +32,5 @@ END : > foo.hin : > stamp-h.in -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/colon5.test b/tests/colon5.test index 7813d9406..fe97f99ce 100755 --- a/tests/colon5.test +++ b/tests/colon5.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -27,7 +30,7 @@ END : > Makefile.am : > Makefile.dep -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep 'Makefile:Makefile.in' Makefile.in diff --git a/tests/colon6.test b/tests/colon6.test index 5bd996446..99877c5f6 100755 --- a/tests/colon6.test +++ b/tests/colon6.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -29,5 +32,5 @@ mkdir demo : > demo/Makefile.am : > demo/version.gin -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/comment.test b/tests/comment.test index 0051cd038..761dbf59d 100755 --- a/tests/comment.test +++ b/tests/comment.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +19,11 @@ . ./defs || Exit 1 +set -e + cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = #no such option END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test index a685a2986..21ed65da4 100755 --- a/tests/compile_f90_c_cxx.test +++ b/tests/compile_f90_c_cxx.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +21,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX @@ -37,14 +40,13 @@ END : > bar.c : > baz.cc -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 - +$ACLOCAL +$AUTOMAKE # Look for the macros at the beginning of rules. Be careful, as there # are literal tabs at the beginning of the search strings. -grep ' \$(COMPILE)' Makefile.in || Exit 1 -grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1 -grep ' \$(FCCOMPILE)' Makefile.in || Exit 1 +$FGREP ' $(COMPILE)' Makefile.in +$FGREP ' $(CXXCOMPILE)' Makefile.in +$FGREP ' $(FCCOMPILE)' Makefile.in Exit 0 diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test index 941c7dbea..a995527c9 100755 --- a/tests/compile_f_c_cxx.test +++ b/tests/compile_f_c_cxx.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +21,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX @@ -37,14 +40,13 @@ END : > bar.c : > baz.cc -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 - +$ACLOCAL +$AUTOMAKE # Look for the macros at the beginning of rules. Be careful, as there # are literal tabs at the beginning of the search strings. -grep ' \$(COMPILE)' Makefile.in || Exit 1 -grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1 -grep ' \$(F77COMPILE)' Makefile.in || Exit 1 +$FGREP ' $(COMPILE)' Makefile.in +$FGREP ' $(CXXCOMPILE)' Makefile.in +$FGREP ' $(F77COMPILE)' Makefile.in Exit 0 diff --git a/tests/cond13.test b/tests/cond13.test index 3cf546287..d8c436159 100755 --- a/tests/cond13.test +++ b/tests/cond13.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX @@ -47,7 +49,7 @@ endif libtest_a_SOURCES = $(TESTSOURCES) END -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep 'am_libtest_a_OBJECTS = .*$' Makefile.in diff --git a/tests/cond3.test b/tests/cond3.test index 672872186..e2dbdafa3 100755 --- a/tests/cond3.test +++ b/tests/cond3.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2010 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +20,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -53,8 +56,8 @@ endif targ_SOURCES = $(SONE) $(STWO) $(STHREE) END -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE # `b top' so that sed -n ' @@ -76,4 +79,4 @@ am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3) targ_OBJECTS = $(am_targ_OBJECTS) EOF -diff expected produced || Exit 1 +diff expected produced diff --git a/tests/cond6.test b/tests/cond6.test index 1f442f937..ec4003227 100755 --- a/tests/cond6.test +++ b/tests/cond6.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ . ./defs || Exit 1 +set -e + echo 'AM_CONDITIONAL(FOO, true)' >> configure.in cat > Makefile.am << 'END' @@ -37,5 +39,5 @@ help_DATA = foo endif END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/cond8.test b/tests/cond8.test index 195a91241..0a45ad3bb 100755 --- a/tests/cond8.test +++ b/tests/cond8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,8 +19,12 @@ . ./defs || Exit 1 -echo 'AC_PROG_CC' >> configure.in -echo 'AM_CONDITIONAL(X, false)' >> configure.in +set -e + +cat >> configure.in << 'END' +AC_PROG_CC +AM_CONDITIONAL(X, false) +END cat > Makefile.am << 'END' if X @@ -30,5 +34,5 @@ noinst_PROGRAMS = x y endif END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/conf2.test b/tests/conf2.test index 23a8a5b19..8e53733e7 100755 --- a/tests/conf2.test +++ b/tests/conf2.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +19,8 @@ . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -31,5 +34,5 @@ END : > config.h.in : > two.h.in -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE diff --git a/tests/confh4.test b/tests/confh4.test index a93e38de5..6fd4a0773 100755 --- a/tests/confh4.test +++ b/tests/confh4.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2010 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,9 +16,17 @@ # along with this program. If not, see . # Test for PR 34. +# > Description: +# Automake fails to add -I option to include configuration +# header indicated like AM_CONFIG_HEADER(magick/config.h) +# > How-To-Repeat: +# Use AM_CONFIG_HEADER(subdir/config.h) to place configuration +# header in subdirectory and observe that it is not included. . ./defs || Exit 1 +set -e + cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) @@ -38,7 +47,7 @@ mkdir include : > include/Makefile.am : > include/config.h.in -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE $EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in diff --git a/tests/confvar.test b/tests/confvar.test index f098baf9d..99811b0cd 100755 --- a/tests/confvar.test +++ b/tests/confvar.test @@ -18,13 +18,15 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_SUBST(QBERT) END : > Makefile.am -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE grep '^QBERT' Makefile.in diff --git a/tests/confvar2.test b/tests/confvar2.test index ea9c81e9c..75c02dc05 100755 --- a/tests/confvar2.test +++ b/tests/confvar2.test @@ -18,6 +18,8 @@ . ./defs || Exit 1 +set -e + cat >> configure.in << 'END' AC_SUBST(OTHER_SCRIPTS) END @@ -26,5 +28,5 @@ cat > Makefile.am << 'END' bin_SCRIPTS = foo END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE