diff options
51 files changed, 72 insertions, 7 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 33779b665..f35fb488b 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,21 @@ +2000-01-08 Tom Tromey <tromey@cygnus.com> + + * ansi.test, texinfo.test, empty.test, insh2.test, texinfo8.test: + Remove @SET_MAKE@ before using Makefile. + * backsl2.test: Don't add AC_PROG_MAKE_SET in configure.in; + already done. + * defs: Put AC_PROG_MAKE_SET in configure.in. + * acoutnoq.test, acoutput.test, acoutqnl.test, acouttbs.test, + acouttbs2.test, colon.test, colon2.test, colon3.test, colon4.test, + colon5.test, colon6.test, colon7.test, conf2.test, confh.test, + confh2.test, confh3.test, confh4.test, config.test, depend3.test, + discover.test, fpinst2.test, gnits.test, ldadd.test, libobj.test, + libobj10.test, libobj2.test, libobj6.test, libobj7.test, + libobj8.test, libobj9.test, output.test, output2.test, + output3.test, output4.test, output5.test, package.test, + parse.test, pr2.test, remake.test, remake2.test, scripts.test, + stamph.test, texinfo8.test: Likewise. + 1999-12-26 Tom Tromey <tromey@cygnus.com> * subobj3.test: Remove depcomp. diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test index f753800e7..bdda3b282 100755 --- a/tests/acoutnoq.test +++ b/tests/acoutnoq.test @@ -13,6 +13,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(Makefile, [true]) END diff --git a/tests/acoutput.test b/tests/acoutput.test index 53c59d03e..e9fe4f9fd 100755 --- a/tests/acoutput.test +++ b/tests/acoutput.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT([Makefile], [true]) END diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test index 94c909d99..bcfb01626 100755 --- a/tests/acoutqnl.test +++ b/tests/acoutqnl.test @@ -9,6 +9,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT([Makefile], [echo zardoz has spoken]) END diff --git a/tests/acouttbs.test b/tests/acouttbs.test index 88be5d23d..61a9c4f16 100755 --- a/tests/acouttbs.test +++ b/tests/acouttbs.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(Makefile \ zot) END diff --git a/tests/acouttbs2.test b/tests/acouttbs2.test index 417b180fa..e1297812c 100755 --- a/tests/acouttbs2.test +++ b/tests/acouttbs2.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(\ Makefile \ zot diff --git a/tests/ansi.test b/tests/ansi.test index 1140cadcb..0e133c298 100755 --- a/tests/ansi.test +++ b/tests/ansi.test @@ -20,4 +20,5 @@ END $AUTOMAKE || exit 1 -$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep 'ansi2knr\.c' +fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed +$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c' diff --git a/tests/backsl2.test b/tests/backsl2.test index c9c13674b..9d3dcb2c6 100755 --- a/tests/backsl2.test +++ b/tests/backsl2.test @@ -5,8 +5,6 @@ . $srcdir/defs || exit 1 -echo 'AC_PROG_MAKE_SET' >> configure.in - cat > Makefile.am << 'END' SUBDIRS = \ . diff --git a/tests/colon.test b/tests/colon.test index 672bb54b7..b5888da9b 100755 --- a/tests/colon.test +++ b/tests/colon.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(Makefile foo.h:foo.hin) END diff --git a/tests/colon2.test b/tests/colon2.test index feeda98ee..c1a45b123 100755 --- a/tests/colon2.test +++ b/tests/colon2.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile:zardoz.in) END diff --git a/tests/colon3.test b/tests/colon3.test index 41ee2127a..3fcd87293 100755 --- a/tests/colon3.test +++ b/tests/colon3.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(Makefile:zardoz.in:two.in:three.in) END diff --git a/tests/colon4.test b/tests/colon4.test index c94059def..43f3d3b8d 100755 --- a/tests/colon4.test +++ b/tests/colon4.test @@ -10,6 +10,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile zardoz:one:two:three) END diff --git a/tests/colon5.test b/tests/colon5.test index f1ca62641..9394d8f24 100755 --- a/tests/colon5.test +++ b/tests/colon5.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile:Makefile.in:Makefile.dep) END diff --git a/tests/colon6.test b/tests/colon6.test index f156d3e42..a402d6d74 100755 --- a/tests/colon6.test +++ b/tests/colon6.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(demo/Makefile demo/version.good:demo/version.gin) END diff --git a/tests/colon7.test b/tests/colon7.test index 0e57f925e..e921a125b 100755 --- a/tests/colon7.test +++ b/tests/colon7.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(subdir/bar:subdir/foo \ Makefile \ diff --git a/tests/conf2.test b/tests/conf2.test index 52a02650c..9638e3910 100755 --- a/tests/conf2.test +++ b/tests/conf2.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile) END diff --git a/tests/confh.test b/tests/confh.test index 63dd433f8..e183c7a68 100755 --- a/tests/confh.test +++ b/tests/confh.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AM_CONFIG_HEADER(include/config.h) AC_OUTPUT(Makefile include/Makefile) END diff --git a/tests/confh2.test b/tests/confh2.test index 45b64f8f6..cef816b3d 100755 --- a/tests/confh2.test +++ b/tests/confh2.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AM_CONFIG_HEADER(config.h:include/config.h.in) AC_OUTPUT(Makefile) END diff --git a/tests/confh3.test b/tests/confh3.test index 8cfe58953..9bd8aefdf 100755 --- a/tests/confh3.test +++ b/tests/confh3.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AM_CONFIG_HEADER(d1/config.h:d2/config.h.in) AC_OUTPUT(Makefile d1/Makefile) END diff --git a/tests/confh4.test b/tests/confh4.test index bae467ec3..af41ca988 100755 --- a/tests/confh4.test +++ b/tests/confh4.test @@ -10,6 +10,7 @@ VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL AM_CONFIG_HEADER(include/config.h) +AC_PROG_MAKE_SET AC_PROG_CC AC_OUTPUT(Makefile include/Makefile) END diff --git a/tests/config.test b/tests/config.test index cbe6ba7b1..562c147ab 100755 --- a/tests/config.test +++ b/tests/config.test @@ -12,6 +12,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile) END diff --git a/tests/defs b/tests/defs index ec937ead8..4e41f16bb 100644 --- a/tests/defs +++ b/tests/defs @@ -31,6 +31,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL +AC_PROG_MAKE_SET AC_OUTPUT(Makefile) END diff --git a/tests/depend3.test b/tests/depend3.test index 7ff4909ce..c047d34de 100755 --- a/tests/depend3.test +++ b/tests/depend3.test @@ -10,6 +10,7 @@ VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_CC +AC_PROG_MAKE_SET AC_SUBST(DEPS) AC_OUTPUT(Makefile) END diff --git a/tests/discover.test b/tests/discover.test index 2daa9e774..ac7485615 100755 --- a/tests/discover.test +++ b/tests/discover.test @@ -10,6 +10,7 @@ VERSION=nonesuch AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_MAKE_SET AC_PROG_CC LIBOBJS="$LIBOBJS fsusage.o" AC_OUTPUT(Makefile) diff --git a/tests/empty.test b/tests/empty.test index 14a712455..112b2c6bd 100755 --- a/tests/empty.test +++ b/tests/empty.test @@ -26,6 +26,6 @@ chmod +x mkinstalldirs # Substitute variables we need. sed -e 's,@SHELL@,/bin/sh,g' -e 's/@srcdir@/./g' \ -e 's/@top_srcdir@/./g' -e 's/@datadir@/./g' \ - < Makefile.in > Makefile + -e 's/@SET_MAKE@//g' < Makefile.in > Makefile $MAKE install diff --git a/tests/fpinst2.test b/tests/fpinst2.test index ed814cb84..2b5032d4c 100755 --- a/tests/fpinst2.test +++ b/tests/fpinst2.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_INSTALL AC_OUTPUT(Makefile) diff --git a/tests/fpinstall.test b/tests/fpinstall.test index d5ed8f47d..39f7cdcbf 100755 --- a/tests/fpinstall.test +++ b/tests/fpinstall.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_INSTALL AC_OUTPUT(Makefile) diff --git a/tests/gnits.test b/tests/gnits.test index e4243be3d..131d2ace2 100755 --- a/tests/gnits.test +++ b/tests/gnits.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=3.5.3.2 AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile) END diff --git a/tests/insh2.test b/tests/insh2.test index ae4ea2c92..9f35a6c20 100755 --- a/tests/insh2.test +++ b/tests/insh2.test @@ -12,4 +12,5 @@ END $AUTOMAKE || exit 1 -$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep install-sh +fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed +$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh diff --git a/tests/ldadd.test b/tests/ldadd.test index ef02aaabd..2b7fbd45a 100755 --- a/tests/ldadd.test +++ b/tests/ldadd.test @@ -12,6 +12,7 @@ AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_LIBTOOL AC_OUTPUT(Makefile) +AC_PROG_MAKE_SET LTLIBOBJS="$LTLIBOBJS q.o" LIBOBJS="$LIBOBJS q.o" AC_SUBST(LTLIBOBJS) diff --git a/tests/libobj.test b/tests/libobj.test index 7918f86e6..d1969a869 100755 --- a/tests/libobj.test +++ b/tests/libobj.test @@ -10,6 +10,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj10.test b/tests/libobj10.test index d0bc7cb8a..ca0afc566 100755 --- a/tests/libobj10.test +++ b/tests/libobj10.test @@ -10,6 +10,7 @@ PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_INSTALL LIBOBJS="$LIBOBJS foo.o" diff --git a/tests/libobj2.test b/tests/libobj2.test index fa9b889d6..2e52cf2e6 100755 --- a/tests/libobj2.test +++ b/tests/libobj2.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj6.test b/tests/libobj6.test index 9094cf578..1f7004a2b 100755 --- a/tests/libobj6.test +++ b/tests/libobj6.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj7.test b/tests/libobj7.test index ed0d101e7..9351c20d0 100755 --- a/tests/libobj7.test +++ b/tests/libobj7.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj8.test b/tests/libobj8.test index a4b40907b..77d8e0350 100755 --- a/tests/libobj8.test +++ b/tests/libobj8.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj9.test b/tests/libobj9.test index 286e4ff03..823d60327 100755 --- a/tests/libobj9.test +++ b/tests/libobj9.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/output.test b/tests/output.test index dfb609cea..6a9d55b42 100755 --- a/tests/output.test +++ b/tests/output.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile frob/zardoz) END diff --git a/tests/output2.test b/tests/output2.test index 711de2d89..608608eaa 100755 --- a/tests/output2.test +++ b/tests/output2.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile intl/intlh.inst po/Makefile.in misc/gettextize) END diff --git a/tests/output3.test b/tests/output3.test index 311fe03b2..c86f9ef28 100755 --- a/tests/output3.test +++ b/tests/output3.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT([Makefile tests/Makefile tests/defs], diff --git a/tests/output4.test b/tests/output4.test index 91e960f54..6bfd49106 100755 --- a/tests/output4.test +++ b/tests/output4.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(tests/Makefile tests/defs) END diff --git a/tests/output5.test b/tests/output5.test index 8bfd99f0a..d490a3ec9 100755 --- a/tests/output5.test +++ b/tests/output5.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT() END diff --git a/tests/package.test b/tests/package.test index f920d7e6f..a8f84e9c5 100755 --- a/tests/package.test +++ b/tests/package.test @@ -6,6 +6,7 @@ cat > configure.in << 'END' AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile) END diff --git a/tests/parse.test b/tests/parse.test index fb7cec514..53d776791 100755 --- a/tests/parse.test +++ b/tests/parse.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_PROG_CC +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/pr2.test b/tests/pr2.test index 5c4632c6b..0f1c5f042 100755 --- a/tests/pr2.test +++ b/tests/pr2.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(README.foo:templ/README.foo.in Makefile) END diff --git a/tests/remake.test b/tests/remake.test index cf2876516..c02b3a3bb 100755 --- a/tests/remake.test +++ b/tests/remake.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(sub/Makefile) END diff --git a/tests/remake2.test b/tests/remake2.test index b8b804400..f0012603a 100755 --- a/tests/remake2.test +++ b/tests/remake2.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(sub/Makefile) END diff --git a/tests/scripts.test b/tests/scripts.test index 6f7c15ad1..a3f29c780 100755 --- a/tests/scripts.test +++ b/tests/scripts.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch +AC_PROG_MAKE_SET AC_ARG_PROGRAM AC_PROG_INSTALL AC_OUTPUT(Makefile) diff --git a/tests/stamph.test b/tests/stamph.test index bf3b3f77a..41019c3e4 100755 --- a/tests/stamph.test +++ b/tests/stamph.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile stamp-h) END diff --git a/tests/texinfo.test b/tests/texinfo.test index 14218671c..77b1538f6 100755 --- a/tests/texinfo.test +++ b/tests/texinfo.test @@ -16,4 +16,5 @@ echo '@setfilename textutils.info' > textutils.texi $AUTOMAKE || exit 1 -$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep 'texinfo\.tex' +fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed +$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex' diff --git a/tests/texinfo8.test b/tests/texinfo8.test index d68e8488b..4607e4c2c 100755 --- a/tests/texinfo8.test +++ b/tests/texinfo8.test @@ -10,6 +10,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch AC_ARG_PROGRAM +AC_PROG_MAKE_SET AC_PROG_INSTALL AC_OUTPUT(Makefile sub/Makefile) AC_CONFIG_AUX_DIR(sub) @@ -30,8 +31,9 @@ END $AUTOMAKE -a || exit 1 +fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed test -f sub/texinfo.tex && -$MAKE -s -f sub/Makefile.in SHELL=/bin/sh magic | grep 'texinfo\.tex' +$MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex' stat=$? exit $stat |