* subdir3.test: New file.

	* Makefile.am (TESTS): Added subdir3.test.
	* xsource.test: Changed to check whether multiple source files
	with same object name cause failure.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 4aa0601513190b4019e24a4797ac23aa71af7391..a8c3e1ecb43bd0d4e55ec8485a3f8301a84c6e97 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+1999-03-21  Tom Tromey  <tromey@cygnus.com>
+
+       * subdir3.test: New file.
+       * Makefile.am (TESTS): Added subdir3.test.
+       * xsource.test: Changed to check whether multiple source files
+       with same object name cause failure.
+
 1999-03-11  Tom Tromey  <tromey@cygnus.com>
 
        * libobj9.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e8d93114b5ec4c6dc0e0ff27ab0a9afa573d5a5f..7da4de74c16be4a5465f275d3d9c68cf945374f2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,11 +36,12 @@ 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
+subdir.test subdir2.test subdir3.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 978562fad2b73f7d8264c5e0989a8c1658f421b2..1b34c30908f4eb711322b5623d744b3a32a40ba8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,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 confh3.test config.test confincl.test confsub.test confvar.test confvar2.test copy.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 ext.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 lex3.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test libobj9.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 obsolete2.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 ppf77.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 copy.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 ext.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 lex3.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test libobj9.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 obsolete2.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 ppf77.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 subdir3.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/subdir3.test b/tests/subdir3.test
new file mode 100755 (executable)
index 0000000..7c0d219
--- /dev/null
+++ b/tests/subdir3.test
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Test to make sure subdir source file generates explicit dependency.
+# Also test to make sure only one such dependency is generated.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz widdershins
+zardoz_SOURCES = y.c x/z.c
+widdershins = x/z.c
+END
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
+
+mkdir x
+
+: > y.c
+: > x/z.c
+
+$AUTOMAKE || exit 1
+
+num=`grep '^z\.o: x/z\.c$' Makefile.in | wc -l`
+test $num -eq 1

diff --git a/tests/xsource.test b/tests/xsource.test
index 07b1953c12077bf354e3494a647a25967ba0f42c..566944422f25b6f117d20a44baf5368489d46607 100755 (executable)
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -1,12 +1,13 @@
 #! /bin/sh
 
-# Test to make sure source in another directory correctly fails.
+# Test to make sure multiple source files with the same object
+# file causes error.
 
 . $srcdir/defs || exit 1
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = zardoz
-zardoz_SOURCES = z.c x/y.c
+zardoz_SOURCES = z.c x/z.c
 END
 
 cat >> configure.in << 'END'
@@ -16,7 +17,7 @@ END
 mkdir x
 
 : > z.c
-: > x/y.c
+: > x/z.c
 
 $AUTOMAKE && exit 1
 exit 0