shell: sync ash/hush test scripts

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/shell/hush_test/run-all b/shell/hush_test/run-all
index 3fbc7c531..7345fee43 100755
--- a/shell/hush_test/run-all
+++ b/shell/hush_test/run-all
@@ -29,7 +29,7 @@ fi
 
 eval $(sed -e '/^#/d' -e '/^$/d' -e 's:^:export :' .config)
 
-PATH="`pwd`:$PATH" # for hush and recho/zecho/printenv
+PATH="`pwd`:$PATH" # for hush
 export PATH
 
 THIS_SH="`pwd`/hush"
@@ -67,7 +67,8 @@ do_test()
 #               echo Running test: "$x"
                 echo -n "$1/$x:"
                 (
-                        "$THIS_SH" "./$x" >"$name.xx" 2>&1
+                        "$THIS_SH" "./$x" 2>&1 | \
+                                grep -va "^hush: using fallback suid method$" >"$name.xx"
                         r=$?
                         # filter C library differences
                         sed -i \
@@ -83,7 +84,7 @@ do_test()
                         *)  echo " fail ($?)"; tret=1;;
                 esac
         done
-        exit ${tret}
+        exit $tret
         )
 }
 
@@ -95,6 +96,9 @@ ret=0
 if [ $# -lt 1 ]; then
         # All sub directories
         modules=`ls -d hush-*`
+        # If you want to test hush against ash testsuite
+        # (have to copy ash_test dir to current dir first):
+        #modules=`ls -d hush-* ash_test/ash-*`
 
         for module in $modules; do
                 do_test $module || ret=1
@@ -108,4 +112,4 @@ else
         done
 fi
 
-exit ${ret}
+exit $ret