The checks in assign.test are trying to catch case of this ilk:

`foo=bar break', but unfortunately they also choke on `foo=bar;
break' and `foo=bar && break'.  Writing a sophisticated test to
catch just the intended case seems like more trouble than it's
worth, but leaving the test in causes the testsuite to fail on
valid m4sh output:

* tests/assign.test: Removed; chokes on perfectly valid shell
syntax.
* tests/Makefile.am (COMMON_TESTS): Remove assign.test.
* tests/defs.in (scripts): Don't check the m4sh inputs, go back
to checking the generated ltmain.sh script.

diff --git a/ChangeLog b/ChangeLog
index 5864ea3977566136019bc61b34df9e66a6a2ca81..0fc6d74e3253f1836ea458b0fde8fe867bcd9986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-09-19  Gary V. Vaughan  <gary@gnu.org>
+
+       The checks in assign.test are trying to catch case of this ilk:
+       `foo=bar break', but unfortunately they also choke on `foo=bar;
+       break' and `foo=bar && break'.  Writing a sophisticated test to
+       catch just the intended case seems like more trouble than it's
+       worth, but leaving the test in causes the testsuite to fail on
+       valid m4sh output:
+
+       * tests/assign.test: Removed; chokes on perfectly valid shell
+       syntax.
+       * tests/Makefile.am (COMMON_TESTS): Remove assign.test.
+       * tests/defs.in (scripts): Don't check the m4sh inputs, go back
+       to checking the generated ltmain.sh script.
+
 2004-09-17  Gary V. Vaughan  <gary@gnu.org>
 
        * config/ltmain.in (func_echo): Except for multi-line warnings and

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c49c1983cc214772c39ad7522ef9f6083249ebe0..18342502998825ea0761020a99e8ba8402feee4e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ F77_TESTS = \
        f77demo-shared.test f77demo-make.test f77demo-exec.test
 
 COMMON_TESTS = \
-       assign.test link.test link-2.test nomode.test \
+       link.test link-2.test nomode.test \
        quote.test sh.test suffix.test tagtrace.test \
        cdemo-static.test cdemo-make.test cdemo-exec.test \
        demo-static.test demo-make.test demo-exec.test \

diff --git a/tests/assign.test b/tests/assign.test
deleted file mode 100755 (executable)
index c093c25..0000000
--- a/tests/assign.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# assign.test - check that we don't put break or continue on the same
-#               line as an assignment
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, a copy can be downloaded from
-# http://www.gnu.org/copyleft/gpl.html, or by writing to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
-
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
-
-# Check that break and continue aren't misused in our portable shell scripts.
-$EGREP -n '[^   ]=[^    ].*(break|continue)' $scripts \
-  && func_fail "cannot use \`break' or \`continue' on the same line as an assignment"
-
-exit $EXIT_SUCCESS