emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: syncronize ash_test/run-all and hush_test/run-all a bit

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-06 17:59:25 +02:00
parent 3c9688e587
commit 9a8ece5158
2 changed files with 83 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/ash_test/run-all
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
TOPDIR=$PWD TOPDIR=`pwd`
test -x ash || { test -x ash || {
echo "No ./ash - creating a link to ../../busybox" echo "No ./ash - creating a link to ../../busybox"
@ -10,16 +10,17 @@ test -x printenv || gcc -O2 -o printenv printenv.c || exit $?
test -x recho || gcc -O2 -o recho recho.c || exit $? test -x recho || gcc -O2 -o recho recho.c || exit $?
test -x zecho || gcc -O2 -o zecho zecho.c || exit $? test -x zecho || gcc -O2 -o zecho zecho.c || exit $?
PATH="$PWD:$PATH" # for ash and recho/zecho/printenv PATH="`pwd`:$PATH" # for ash and recho/zecho/printenv
export PATH export PATH
THIS_SH="$PWD/ash" THIS_SH="`pwd`/ash"
export THIS_SH export THIS_SH
do_test() do_test()
{ {
test -d "$1" || return 0 test -d "$1" || return 0
# echo do_test "$1" d=${d%/}
# echo Running tests in directory "$1"
# $1 but with / replaced by # so that it can be used as filename part # $1 but with / replaced by # so that it can be used as filename part
noslash=`echo "$1" | sed 's:/:#:g'` noslash=`echo "$1" | sed 's:/:#:g'`
( (
@ -33,7 +34,7 @@ do_test()
*) *)
echo -n "$1/$x:" echo -n "$1/$x:"
sh "$x" >"$TOPDIR/$noslash-$x.fail" 2>&1 && \ sh "$x" >"$TOPDIR/$noslash-$x.fail" 2>&1 && \
{ echo "ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo "fail"; { { echo " ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo " fail"; }
;; ;;
esac esac
done done
@ -43,6 +44,7 @@ do_test()
test -x "$x" || continue test -x "$x" || continue
name="${x%%.tests}" name="${x%%.tests}"
test -f "$name.right" || continue test -f "$name.right" || continue
# echo Running test: "$x"
echo -n "$1/$x:" echo -n "$1/$x:"
{ {
"$THIS_SH" "./$x" >"$name.xx" 2>&1 "$THIS_SH" "./$x" >"$name.xx" 2>&1
@ -53,9 +55,11 @@ do_test()
) )
} }
# main part of this script # Main part of this script
# Usage: run-all [directories] # Usage: run-all [directories]
ret=0
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
# All sub directories # All sub directories
modules=`ls -d ash-*` modules=`ls -d ash-*`
@ -64,13 +68,15 @@ if [ $# -lt 1 ]; then
#modules=`ls -d ash-* hush_test/hush-*` #modules=`ls -d ash-* hush_test/hush-*`
for module in $modules; do for module in $modules; do
do_test $module do_test $module || ret=1
done done
else else
while [ $# -ge 1 ]; do while [ $# -ge 1 ]; do
if [ -d $1 ]; then if [ -d $1 ]; then
do_test $1 do_test $1 || ret=1
fi fi
shift shift
done done
fi fi
exit ${ret}

13
shell/hush_test/run-all
View File

@ -9,6 +9,8 @@ unset LC_NUMERIC
unset LC_TIME unset LC_TIME
unset LC_ALL unset LC_ALL
TOPDIR=`pwd`
if test ! -x hush; then if test ! -x hush; then
if test ! -x ../../busybox; then if test ! -x ../../busybox; then
echo "Can't run tests. Put hush binary into this directory (`pwd`)" echo "Can't run tests. Put hush binary into this directory (`pwd`)"
@ -38,6 +40,8 @@ do_test()
test -d "$1" || return 0 test -d "$1" || return 0
d=${d%/} d=${d%/}
# echo Running tests in directory "$1" # echo Running tests in directory "$1"
# $1 but with / replaced by # so that it can be used as filename part
noslash=`echo "$1" | sed 's:/:#:g'`
( (
tret=0 tret=0
cd "$1" || { echo "cannot cd $1!"; exit 1; } cd "$1" || { echo "cannot cd $1!"; exit 1; }
@ -49,8 +53,8 @@ do_test()
#*) echo $x ; sh $x ;; #*) echo $x ; sh $x ;;
*) *)
echo -n "$1/$x:" echo -n "$1/$x:"
sh "$x" >"../$1-$x.fail" 2>&1 && \ sh "$x" >"$TOPDIR/$noslash-$x.fail" 2>&1 && \
{ { echo " ok"; rm "../$1-$x.fail"; } || echo " fail"; } { { echo " ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo " fail"; }
;; ;;
esac esac
done done
@ -69,8 +73,9 @@ do_test()
sed -i \ sed -i \
-e "/: invalid option /s:'::g" \ -e "/: invalid option /s:'::g" \
"$name.xx" "$name.xx"
test $r -eq 77 && rm -f "../$1-$x.fail" && exit 77 test $r -eq 77 && rm -f "$TOPDIR/$noslash-$x.fail" && exit 77
diff -u "$name.xx" "$name.right" >"../$1-$x.fail" && rm -f "$name.xx" "../$1-$x.fail" diff -u "$name.xx" "$name.right" >"$TOPDIR/$noslash-$x.fail" \
&& rm -f "$name.xx" "$TOPDIR/$noslash-$x.fail"
) )
case $? in case $? in
0) echo " ok";; 0) echo " ok";;