* confh3.test: New file.

	* Makefile.am (TESTS): Added confh3.test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 832bb79a87e9d9ee4900c0b89758b5dd2f146ca3..f1dd01b1f86cf877779bff428fbf3b875ac50975 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-14  Tom Tromey  <tromey@cygnus.com>
 
+       * confh3.test: New file.
+       * Makefile.am (TESTS): Added confh3.test.
+
        * confh2.test: New file.
        * Makefile.am (TESTS): Added confh2.test.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 88a12f5f93b114cd5add8280119ea822f62882a0..38dd348864f5029cf128831d723de6adf3aaa5fe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,35 +11,35 @@ clean.test colneq.test colneq2.test colon.test colon2.test colon3.test \
 colon4.test colon5.test colon6.test colon7.test comment.test \
 comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test \
 cond4.test cond5.test cond6.test cond7.test condman.test condman2.test \
-conf2.test confdist.test confh.test confh2.test config.test \
-confincl.test confsub.test confvar.test confvar2.test cxxcpp.test \
-cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test        \
-defun.test defun2.test dejagnu.test depacl.test depacl2.test \
-depend.test depend2.test depend3.test discover.test distdir.test \
-dup.test dup2.test else.test empty.test error.test exdir.test \
-exdir2.test exsource.test extra.test extra3.test extra4.test \
-flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test \
-gnits.test implicit.test include.test info.test insh.test insh2.test \
-install.test installsh.test instdata.test instexec.test insthook.test \
-instman.test interp.test interp2.test java.test javaprim.test \
-javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test \
-libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test \
-libobj8.test library.test link_c_cxx.test link_f_c.test        \
-link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test \
-mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test \
-noinst.test number.test objc.test obsolete.test order.test outdir.test \
-output.test output2.test output3.test output4.test output5.test        \
-package.test parse.test pluseq.test pluseq2.test pluseq3.test \
-pluseq4.test pluseq5.test prefix.test primary.test primary2.test \
-proginst.test ranlib.test recurs.test recurs2.test remake.test \
-remake2.test req.test rulepat.test scripts.test seenc.test \
-sinclude.test spell.test spell2.test spell3.test spelling.test \
-stamph.test stdlib.test subdir.test subdir2.test subst.test \
-symlink.test syntax.test tags.test tagsub.test target.test \
-texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test \
-texinfo6.test texinfo7.test unused.test version.test version2.test \
-version3.test vpath.test vtexi.test vtexi2.test whoami.test \
-xsource.test yacc.test yaccpp.test
+conf2.test confdist.test confh.test confh2.test confh3.test \
+config.test confincl.test confsub.test confvar.test confvar2.test \
+cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test \
+cygwin32.test defun.test defun2.test dejagnu.test depacl.test \
+depacl2.test depend.test depend2.test depend3.test discover.test \
+distdir.test dup.test dup2.test else.test empty.test error.test        \
+exdir.test exdir2.test exsource.test extra.test extra3.test \
+extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test \
+fpinstall.test gnits.test implicit.test include.test info.test \
+insh.test insh2.test install.test installsh.test instdata.test \
+instexec.test insthook.test instman.test interp.test interp2.test \
+java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test \
+libobj.test libobj2.test libobj3.test libobj4.test libobj5.test        \
+libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test \
+link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test \
+lisp.test mdate.test mdate2.test mdate3.test mkinst2.test \
+mkinstall.test noinst.test number.test objc.test obsolete.test \
+order.test outdir.test output.test output2.test output3.test \
+output4.test output5.test package.test parse.test pluseq.test \
+pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test        \
+primary.test primary2.test proginst.test ranlib.test recurs.test \
+recurs2.test remake.test remake2.test req.test rulepat.test \
+scripts.test seenc.test sinclude.test spell.test spell2.test \
+spell3.test spelling.test stamph.test stdlib.test subdir.test \
+subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test \
+target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test \
+texinfo5.test texinfo6.test texinfo7.test unused.test version.test \
+version2.test version3.test vpath.test vtexi.test vtexi2.test \
+whoami.test xsource.test yacc.test yaccpp.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c51b526195b9825566205fdcf3bd3d819628254a..5666d9fd8e2b001b441c15f0f438a3d41e8cbf32 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -65,7 +65,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test config.test confincl.test confsub.test confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test        defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test    link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test      package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
+TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test   exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test       libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test        primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
 
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/confh2.test b/tests/confh2.test
index c04556d4af89682fd472d179d6acdbf0cf7b1847..45b64f8f6711ce68b111d4a686de2c1c0a3b2533 100755 (executable)
--- a/tests/confh2.test
+++ b/tests/confh2.test
@@ -24,3 +24,5 @@ $AUTOMAKE || exit 1
 
 grep '^config.h:' Makefile.in || exit 1
 fgrep 'echo timestamp > stamp-h' Makefile.in || exit 1
+fgrep '../include/config.h.in' Makefile.in && exit 1
+exit 0

diff --git a/tests/confh3.test b/tests/confh3.test
new file mode 100755 (executable)
index 0000000..0591186
--- /dev/null
+++ b/tests/confh3.test
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Another test to make sure stamp files created correctly.
+# Report from Erez Zadok.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AM_CONFIG_HEADER(d1/config.h:d2/config.h.in)
+AC_OUTPUT(Makefile d1/Makefile)
+END
+
+: > Makefile.am
+: > acconfig.h
+
+mkdir d1 d2
+
+: > d1/Makefile.am
+
+: > d2/config.h.in
+
+$AUTOMAKE || exit 1
+
+grep '^config.h:' d1/Makefile.in || exit 1
+fgrep 'echo timestamp > stamp-h' Makefile.in || exit 1
+fgrep '../d2/config.h.in' Makefile.in || exit 1