* lib/am/check.am (check-TESTS): Match XFAIL_TESTS delimited by

TABs as well as spaces.  Fixes PR automake/490.
* tests/check6.test: New test.
* tests/Makefile.am, THANKS: Update.
Report from Diab Jerius <djerius@cfa.harvard.edu>.

diff --git a/ChangeLog b/ChangeLog
index a47e221d947308b845f760160b30926912ede203..d9cd6c5f75752093d6f20e452d52ce3ce2a1f899 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/am/check.am (check-TESTS): Match XFAIL_TESTS delimited by
+       TABs as well as spaces.  Fixes PR automake/490.
+       * tests/check6.test: New test.
+       * tests/Makefile.am, THANKS: Update.
+       Report from Diab Jerius <djerius@cfa.harvard.edu>.
+
 2006-04-17  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the

diff --git a/THANKS b/THANKS
index f456245a8d15a975fe8bdd18cb962f0bf35cc243..22c92bec3a53a5ecd665ad01f498143b9a35e9b4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -53,6 +53,7 @@ David Pashley         david@davidpashley.com
 David Zaroski          cz253@cleveland.Freenet.Edu
 Dean Povey             dpovey@wedgetail.com
 Derek R. Price         derek.price@openavenue.com
+Diab Jerius            djerius@cfa.harvard.edu
 Didier Cassirame       faded@free.fr
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
 Dmitry Mikhin          dmitrym@acres.com.au

diff --git a/lib/am/check.am b/lib/am/check.am
index 5865e21f79190b991a78cebc387e172654740414..7c23ab77d49c4878adf9b902db6a390617359ccb 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 .PHONY: check-TESTS
 
 check-TESTS: $(TESTS)
-       @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+       @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
        srcdir=$(srcdir); export srcdir; \
        list='$(TESTS)'; \
        if test -n "$$list"; then \
@@ -33,7 +33,7 @@ check-TESTS: $(TESTS)
 ## Success
              all=`expr $$all + 1`; \
              case " $(XFAIL_TESTS) " in \
-             *" $$tst "*) \
+             *$$ws$$tst$$ws*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
                echo "XPASS: $$tst"; \
@@ -46,7 +46,7 @@ check-TESTS: $(TESTS)
 ## Failure
              all=`expr $$all + 1`; \
              case " $(XFAIL_TESTS) " in \
-             *" $$tst "*) \
+             *$$ws$$tst$$ws*) \
                xfail=`expr $$xfail + 1`; \
                echo "XFAIL: $$tst"; \
              ;; \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7043468f5b6b5b6094a4bfa089b10c272726e53a..ad43e1c780475c22431fa3935984188a595cc586 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,6 +83,7 @@ check2.test \
 check3.test \
 check4.test \
 check5.test \
+check6.test \
 checkall.test \
 clean.test \
 clean2.test \

diff --git a/tests/check6.test b/tests/check6.test
new file mode 100755 (executable)
index 0000000..81fb008
--- /dev/null
+++ b/tests/check6.test
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Test for PR 400: XFAIL_TESTS delimited by TABs.
+
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = $(XFAIL_TESTS)
+XFAIL_TESTS = a        b       c
+END
+
+cat >>a <<'END'
+#! /bin/sh
+exit 1
+END
+
+cp a b
+cp a c
+
+chmod a+x a b c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check