* 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.

diff --git a/ChangeLog b/ChangeLog
index 201f1ff02f811c376a5e750142949c74e12d0129..e5eca2653838c4c478f6a64282a5c1782b050ea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * 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.
+
        * libltdl/m4/ltdl.m4 (LT_SYS_SYMBOL_USCORE): Use _LT_EOF, not
        EOF.
 

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index a6acfc9466b28c5a446c523a95e85029856f10c7..ad1f4478b6eea994d9bb29b111bec5c999de5ede 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -334,7 +334,9 @@ func_exec ()
 # 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"
 

diff --git a/tests/sh.test b/tests/sh.test
index 93beadaaa6338384fb155b235907a4de6e106031..fec6fb2612934e95f9719bb00905e5d8c777adbf 100755 (executable)
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -92,9 +92,10 @@ do
 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 @@ func_foo ()
   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