From 318fdde3fe61fe09b4eb5972afd5475765808951 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 19 Apr 2006 16:41:31 +0000 Subject: [PATCH] * 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 . --- ChangeLog | 8 ++++++++ THANKS | 1 + lib/am/check.am | 8 ++++---- tests/Makefile.am | 1 + tests/check6.test | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 4 deletions(-) create mode 100755 tests/check6.test diff --git a/ChangeLog b/ChangeLog index a47e221d..d9cd6c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-19 Ralf Wildenhues + + * 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 . + 2006-04-17 Stepan Kasal * lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the diff --git a/THANKS b/THANKS index f456245a..22c92bec 100644 --- 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 5865e21f..7c23ab77 100644 --- 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 7043468f..ad43e1c7 100644 --- 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 index 00000000..81fb0088 --- /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 -- 2.43.5