FYI: fix sh.test failure from source reorganization

[Ralf Wildenhues]

The second time we have sh.test silently failing and nobody notices.
This Will Not Happen Again[TM].

I have applied this to HEAD.

Cheers,
Ralf

        * tests/defs.m4sh (m4dir, auxdir, scripts): Fix for source tree
        reorganization.
        * tests/sh.test: Adjust.  Also barf on sed diagnostics so this
        test will not fail again silently.

Index: tests/defs.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/defs.m4sh,v
retrieving revision 1.13
diff -u -r1.13 defs.m4sh
--- tests/defs.m4sh     12 Aug 2005 20:19:40 -0000      1.13
+++ tests/defs.m4sh     24 Aug 2005 13:29:27 -0000
@@ -334,7 +334,9 @@
 # Shared global variables for test scripts
 prefix="./_inst"
 srcdir=`cd $srcdir && pwd`
-scripts="$srcdir/config/ltmain.sh ./libtoolize"
+m4dir=$srcdir/libltdl/m4
+auxdir=$srcdir/libltdl/config
+scripts="$auxdir/ltmain.sh ./libtoolize"
 
 func_msg "Running $progname"
 
Index: tests/sh.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/sh.test,v
retrieving revision 1.27
diff -u -r1.27 sh.test
--- tests/sh.test       22 Apr 2005 10:10:30 -0000      1.27
+++ tests/sh.test       24 Aug 2005 13:29:27 -0000
@@ -92,9 +92,10 @@
 done
 
 # Check for opening brace on next line in shell function definition.
+# redirect stderr so we also barf when sed issues diagnostics.
 for s in $scripts
 do
-  if $SED -n '/^func_/{N;/^func_[^     ]* ()\n{$/d;p;}' "$s" |
+  if $SED -n '/^func_/{N;/^func_[^     ]* ()\n{$/d;p;}' "$s" 2>&1 |
      $EGREP .; then
     echo "Function definitions should look like this in $s:
 func_foo ()
@@ -105,11 +106,13 @@
   fi
 done
 
-for s in "$srcdir/m4/libtool.m4"
+# Check for correct usage of $cc_basename.
+# redirect stderr so we also barf when sed issues diagnostics.
+for s in "$m4dir/libtool.m4"
 do
   if $SED -n '/case \$cc_basename in/,/esac/ {
              /^[       ]*[a-zA-Z][a-zA-Z0-9+]*[^*][    ]*)/p
-             };'  $s | $EGREP .; then
+             };'  $s 2>&1 | $EGREP .; then
     echo "\$cc_basename matches should include a trailing \`*' in $s."
     status=$EXIT_FAILURE
   fi