* tests/cond3.test: Strengthen.

diff --git a/ChangeLog b/ChangeLog
index 60c2bbf046b3c9f4590d72478725dcb5bee23040..d778450e2dd16844c4750ec0bc399510a52e78c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-09  Akim Demaille  <akim@epita.fr>
+
+       * tests/cond3.test: Strengthen.
+
 2001-03-09  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&conditional_string): Produce a unique string

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7997ed4296f97eabae9133790534f4d3249f4225..80da6a5810490b32eda471e9b3b7ba9191ecb195 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,8 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = yaccvpath.test
+XFAIL_TESTS = cond3.test yaccvpath.test
+
 TESTS =        \
 acinclude.test \
 aclocal.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fba8467e0f9697f123a858cb082886f270af8cc2..00fc04ea262272020589eb1928f3b094ba0dfb43 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -78,7 +78,8 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = yaccvpath.test
+XFAIL_TESTS = cond3.test yaccvpath.test
+
 TESTS = \
 acinclude.test \
 aclocal.test \

diff --git a/tests/cond3.test b/tests/cond3.test
index 11f90f68a93070b3922e2e5aa4811c86ff465777..e00beb539d98e09a2c7888d7e66d8960e3426775 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Test sources listed in conditional.
-# Report from Rob Savoye <rob@cygnus.com>.
+# Report from Rob Savoye <rob@cygnus.com>, and Lars J. Aas.
 
 . $srcdir/defs || exit 1
 
@@ -40,4 +40,29 @@ END
 
 $AUTOMAKE || exit 1
 
-test "`grep 'am_targ_OBJECTS =' Makefile.in | wc -l`" -eq 8
+sed -n -e '/am_targ_OBJECTS =.*\\$/ {
+   :loop
+   p
+   n
+   /\\$/ b loop
+   p
+   n
+   }' -e '/am_targ_OBJECTS =/ p' Makefile.in >produced
+
+
+cat >expected << 'EOF'
+@ONE_FALSE@@THREE_FALSE@@TWO_TRUE@am_targ_OBJECTS = two.$(OBJEXT)
+@ONE_FALSE@@THREE_FALSE@@TWO_FALSE@am_targ_OBJECTS =
+@ONE_FALSE@@THREE_TRUE@@TWO_TRUE@am_targ_OBJECTS = two.$(OBJEXT) \
+@ONE_FALSE@@THREE_TRUE@@TWO_TRUE@ three.$(OBJEXT)
+@ONE_FALSE@@THREE_TRUE@@TWO_FALSE@am_targ_OBJECTS = three.$(OBJEXT)
+@ONE_TRUE@@THREE_FALSE@@TWO_TRUE@am_targ_OBJECTS = one.$(OBJEXT) \
+@ONE_TRUE@@THREE_FALSE@@TWO_TRUE@ two.$(OBJEXT)
+@ONE_TRUE@@THREE_FALSE@@TWO_FALSE@am_targ_OBJECTS = one.$(OBJEXT)
+@ONE_TRUE@@THREE_TRUE@@TWO_TRUE@am_targ_OBJECTS = one.$(OBJEXT) \
+@ONE_TRUE@@THREE_TRUE@@TWO_TRUE@ two.$(OBJEXT) three.$(OBJEXT)
+@ONE_TRUE@@THREE_TRUE@@TWO_FALSE@am_targ_OBJECTS = one.$(OBJEXT) \
+@ONE_TRUE@@THREE_TRUE@@TWO_FALSE@ three.$(OBJEXT)
+EOF
+
+diff expected produced || exit 1