* extra4.test: New file.

	* extra3.test: New file.
	* Makefile.am (TESTS): Added extra3.test, extra4.test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index cbecf8d587f39d22fb39c9cddbca05831dd618e7..f3d809d3c48590a3f72fa0c87bfae936364dcb3f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+1998-10-07  Tom Tromey  <tromey@cygnus.com>
+
+       * extra4.test: New file.
+       * extra3.test: New file.
+       * Makefile.am (TESTS): Added extra3.test, extra4.test.
+
 Mon Oct  5 12:47:32 1998  Tom Tromey  <tromey@cygnus.com>
 
        * badline.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d1dcb94acf3108cd4bfc1349a2f6647bf8f6296b..c7c49728a5bd30e2c8290709d43b6b8834b77a2b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,7 +33,8 @@ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
 ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test \
-clean.test recurs2.test config.test colon7.test badline.test
+clean.test recurs2.test config.test colon7.test badline.test \
+extra3.test extra4.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 494e7486bf683a28256e1c0c276f44aa94baa3e3..806cb537846513d64cc8477c4f0f3e01f601cfd8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -96,7 +96,8 @@ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
 ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test \
-clean.test recurs2.test config.test colon7.test
+clean.test recurs2.test config.test colon7.test badline.test \
+extra3.test extra4.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/extra3.test b/tests/extra3.test
new file mode 100755 (executable)
index 0000000..5c9a485
--- /dev/null
+++ b/tests/extra3.test
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# Check to make sure EXTRA_DATA not required.
+
+. $srcdir/defs || exit 1
+
+echo 'AC_SUBST(CODICIL)' >> configure.in
+
+cat > Makefile.am << 'END'
+sysconf_DATA = @CODICIL@
+END
+
+$AUTOMAKE

diff --git a/tests/extra4.test b/tests/extra4.test
new file mode 100755 (executable)
index 0000000..15e8c36
--- /dev/null
+++ b/tests/extra4.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Check to make sure EXTRA_DATA cannot be required.
+
+. $srcdir/defs || exit 1
+
+echo 'AC_SUBST(CODICIL)' >> configure.in
+
+cat > Makefile.am << 'END'
+sysconf_DATA = @CODICIL@
+EXTRA_DATA = codicil.txt
+END
+
+$AUTOMAKE && exit 1
+exit 0