* tests/Makefile.am (TESTS): Added condd.test.

	(XFAIL_TESTS): Added condd.test.
	* tests/condd.test: New file.

diff --git a/ChangeLog b/ChangeLog
index afd4878..8922ead 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-20  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Added condd.test.
+       (XFAIL_TESTS): Added condd.test.
+       * tests/condd.test: New file.
+
 2001-10-20  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&scan_autoconf_traces): Add support for

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22da447..6c6cabe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test auxdir2.test cond17.test nobase.test
+XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test nobase.test
 
 TESTS =        \
 acinclude.test \
@@ -74,6 +74,7 @@ cond17.test \
 cond18.test \
 cond19.test \
 cond20.test \
+condd.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7936b61..54ccb6a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -72,7 +72,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test auxdir2.test cond17.test nobase.test
+XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test nobase.test
 
 TESTS = \
 acinclude.test \
@@ -146,6 +146,7 @@ cond17.test \
 cond18.test \
 cond19.test \
 cond20.test \
+condd.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/condd.test b/tests/condd.test
new file mode 100755 (executable)
index 0000000..7e828a1
--- /dev/null
+++ b/tests/condd.test
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+# Test for bug in conditionals.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_CONDITIONAL(COND1, true)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = foo
+if COND1
+SUBDIRS += bar
+endif
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE