From 256a57be36dcf61208dce580d3ec3fd2363178ee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 20 Oct 2001 19:12:34 +0000 Subject: [PATCH] * tests/Makefile.am (TESTS): Added condd.test. (XFAIL_TESTS): Added condd.test. * tests/condd.test: New file. --- ChangeLog | 6 ++++++ tests/Makefile.am | 3 ++- tests/Makefile.in | 3 ++- tests/condd.test | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 tests/condd.test diff --git a/ChangeLog b/ChangeLog index afd4878..8922ead 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-10-20 Tom Tromey + + * tests/Makefile.am (TESTS): Added condd.test. + (XFAIL_TESTS): Added condd.test. + * tests/condd.test: New file. + 2001-10-20 Akim Demaille * automake.in (&scan_autoconf_traces): Add support for diff --git a/tests/Makefile.am b/tests/Makefile.am index 22da447..6c6cabe 100644 --- 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 --- 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 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 -- 2.7.4