From: Ben Gras <ben@minix3.org>
Date: Mon, 16 Apr 2012 13:39:50 +0000 (+0200)
Subject: test scripts fixes
X-Git-Tag: v3.2.1~582
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.host.html?a=commitdiff_plain;h=5086f1b2a17bca1837ad72356888986938c48697;p=minix.git

test scripts fixes
---

diff --git a/test/run b/test/run
index a0d91010e..7b0cf3689 100755
--- 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 2ebd1543c..13407d9a0 100755
--- 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