* cond7.test: New file. From Pavel Roskin.

	* Makefile.am (TESTS): New file.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 03344a3c57d0d2871fd8e1c57ce30ecb377e8ca1..196a4b098b2749bacab5ae0e8eeb5a0a94f35f0c 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-27  Tom Tromey  <tromey@cygnus.com>
+
+       * cond7.test: New file.  From Pavel Roskin.
+       * Makefile.am (TESTS): New file.
+
 1998-11-10  Tom Tromey  <tromey@cygnus.com>
 
        * pluseq4.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 313a0e83950cc1d5bf490a0ba834a580a36d52f0..43c8407408d3c6713e03391d9f632cb32fe0e478 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,34 +10,34 @@ 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 condman.test condman2.test conf2.test \
-confdist.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 info.test insh.test insh2.test \
-install.test installsh.test instdata.test instexec.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 \
-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 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
+cond4.test cond5.test cond6.test cond7.test condman.test condman2.test \
+conf2.test confdist.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 info.test \
+insh.test insh2.test install.test installsh.test instdata.test \
+instexec.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 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 \
+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 5f340c25637ad93b9b2c2d841117e4bef5c0f097..da375605218a178631546ff3ed3f8cd25aa96338 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -65,42 +65,8 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test \
-acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.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 condman.test condman2.test conf2.test \
-confdist.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 info.test insh.test insh2.test \
-install.test installsh.test instdata.test instexec.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 \
-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 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 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 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 info.test insh.test insh2.test install.test installsh.test instdata.test instexec.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 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 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
@@ -214,7 +180,6 @@ clean-am:  clean-generic mostlyclean-am
 clean: clean-am
 
 distclean-am:  distclean-generic clean-am distclean-local
-       -rm -f config.status
 
 distclean: distclean-am
 

diff --git a/tests/cond7.test b/tests/cond7.test
new file mode 100755 (executable)
index 0000000..7a257b4
--- /dev/null
+++ b/tests/cond7.test
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Test for an odd conditional bug.  Report from Pavel Roskin.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT()
+AM_INIT_AUTOMAKE(test,0.1)
+compat=yes
+AM_CONDITIONAL(Compatible, test x$compat = xyes)
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS=foreign
+if Compatible
+abdir = none
+ab_HEADERS = \
+        minus.h
+endif
+END
+
+$AUTOMAKE || exit 1
+grep '002' Makefile.in && exit 1
+exit 0