* pluseq2.test: New file.

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

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0b9674ca23891bfe9bf736e1c79e34b7d60087c6..549ba203adcb6260f5b9d918854873d362dc93fe 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-09  Tom Tromey  <tromey@cygnus.com>
+
+       * pluseq2.test: New file.
+       * Makefile.am (TESTS): Added pluseq2.test.
+
 1998-10-30  Tom Tromey  <tromey@cygnus.com>
 
        * pluseq.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d56d9bd41c1bda43e33b7e8fd783e02d3a823d0..4c1c8d3241236f5f3af9b6ad44c480ff4f6ce811 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,15 +28,16 @@ link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.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 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
+pluseq.test pluseq2.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 d482cc14ccdb320218205502b5a3b8c2a47f9455..a7874afea8d3ec59148d8c1e32520f3ab2cc88e0 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -91,15 +91,16 @@ link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.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 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
+pluseq.test pluseq2.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)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/pluseq2.test b/tests/pluseq2.test
new file mode 100755 (executable)
index 0000000..69b8b2d
--- /dev/null
+++ b/tests/pluseq2.test
@@ -0,0 +1,29 @@
+#! /bin/sh
+
+# Test `+=' with conditionals.
+
+. $srcdir/defs || exit 1
+
+echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in
+
+cat > Makefile.am << 'END'
+
+if CHECK
+data_DATA = zar
+endif
+
+if CHECK
+data_DATA += doz
+else
+data_DATA += dog
+endif
+
+END
+
+: > zar
+: > doz
+: > dog
+
+$AUTOMAKE || exit 1
+fgrep '= zar doz' Makefile.in || exit 1
+fgrep '= dog' Makefile.in