test scripts fixes

diff --git a/test/run b/test/run
index a0d91010ec99061ec6f88579e7f150602fb0b8d6..7b0cf36894bc1b579d0aa39b514a69c5ec23df4d 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -44,10 +44,11 @@ do
       total=`expr $total + 1`
       FAIL=0
       unset ARG
-      ARG=`eval echo "\\${ARGS_$i}"`
+      testid="`echo $i | sed 's/\..*//'`"
+      ARG=`eval echo "\\${ARGS_$testid}"`
       if [ "$USER" = root ]
          then su - bin -c "cd `pwd`; ./test$i" || FAIL=1
-         else echo ./test$i $ARG || FAIL=1
+         else ./test$i $ARG || FAIL=1
       fi
       if [ $FAIL -eq 0 ]
          then passed=`expr $passed + 1`

diff --git a/test/testsh1.sh b/test/testsh1.sh
index 2ebd1543c8bc4f7e43a59e0907126ea2a9f8f5c5..13407d9a078ea63cc5555e20fd5c8e0af43f84df 100755 (executable)
--- a/test/testsh1.sh
+++ b/test/testsh1.sh
@@ -81,7 +81,7 @@ g/c/s//!!!!!/g
 w
 q
 END
-ed x <y >/dev/null
+ed 2>/dev/null x <y >/dev/null
 cat >y <<END
 g/#####/s//a/g
 g/@@@@@/s//b/g
@@ -89,7 +89,7 @@ g/!!!!!/s//c/g
 w
 q
 END
-ed x <y >/dev/null
+ed 2>/dev/null x <y >/dev/null
 if cmp -s x $f; then : ; else echo Error in ed test 1; fi
 rm x y