From 2feaa227a4ddbf642207beebe7ac5ce85c57f018 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 3 Oct 2016 00:51:29 +0200 Subject: [PATCH] shell: delete all msh tests Signed-off-by: Denys Vlasenko --- shell/msh_test/msh-bugs/noeol3.right | 1 - shell/msh_test/msh-bugs/noeol3.tests | 2 - shell/msh_test/msh-bugs/process_subst.right | 3 - shell/msh_test/msh-bugs/process_subst.tests | 3 - shell/msh_test/msh-bugs/read.right | 4 -- shell/msh_test/msh-bugs/read.tests | 4 -- shell/msh_test/msh-bugs/shift.right | 6 -- shell/msh_test/msh-bugs/shift.tests | 14 ---- shell/msh_test/msh-bugs/starquoted.right | 8 --- shell/msh_test/msh-bugs/starquoted.tests | 8 --- shell/msh_test/msh-bugs/syntax_err.right | 2 - shell/msh_test/msh-bugs/syntax_err.tests | 3 - .../msh-bugs/var_expand_in_assign.right | 5 -- .../msh-bugs/var_expand_in_assign.tests | 15 ----- .../msh-bugs/var_expand_in_redir.right | 3 - .../msh-bugs/var_expand_in_redir.tests | 13 ---- .../msh-execution/exitcode_EACCES.right | 2 - .../msh-execution/exitcode_EACCES.tests | 2 - .../msh-execution/exitcode_ENOENT.right | 2 - .../msh-execution/exitcode_ENOENT.tests | 2 - .../msh-execution/many_continues.right | 1 - .../msh-execution/many_continues.tests | 15 ----- .../msh_test/msh-execution/nested_break.right | 8 --- .../msh_test/msh-execution/nested_break.tests | 17 ----- shell/msh_test/msh-misc/tick.right | 2 - shell/msh_test/msh-misc/tick.tests | 4 -- shell/msh_test/msh-parsing/argv0.right | 1 - shell/msh_test/msh-parsing/argv0.tests | 4 -- shell/msh_test/msh-parsing/noeol.right | 1 - shell/msh_test/msh-parsing/noeol.tests | 2 - shell/msh_test/msh-parsing/noeol2.right | 1 - shell/msh_test/msh-parsing/noeol2.tests | 7 -- shell/msh_test/msh-parsing/quote1.right | 1 - shell/msh_test/msh-parsing/quote1.tests | 2 - shell/msh_test/msh-parsing/quote2.right | 1 - shell/msh_test/msh-parsing/quote2.tests | 2 - shell/msh_test/msh-parsing/quote3.right | 3 - shell/msh_test/msh-parsing/quote3.tests | 8 --- shell/msh_test/msh-parsing/quote4.right | 1 - shell/msh_test/msh-parsing/quote4.tests | 2 - shell/msh_test/msh-vars/star.right | 6 -- shell/msh_test/msh-vars/star.tests | 8 --- shell/msh_test/msh-vars/var.right | 4 -- shell/msh_test/msh-vars/var.tests | 9 --- .../msh_test/msh-vars/var_subst_in_for.right | 40 ------------ .../msh_test/msh-vars/var_subst_in_for.tests | 40 ------------ shell/msh_test/run-all | 64 ------------------- 47 files changed, 356 deletions(-) delete mode 100644 shell/msh_test/msh-bugs/noeol3.right delete mode 100755 shell/msh_test/msh-bugs/noeol3.tests delete mode 100644 shell/msh_test/msh-bugs/process_subst.right delete mode 100755 shell/msh_test/msh-bugs/process_subst.tests delete mode 100644 shell/msh_test/msh-bugs/read.right delete mode 100755 shell/msh_test/msh-bugs/read.tests delete mode 100644 shell/msh_test/msh-bugs/shift.right delete mode 100755 shell/msh_test/msh-bugs/shift.tests delete mode 100644 shell/msh_test/msh-bugs/starquoted.right delete mode 100755 shell/msh_test/msh-bugs/starquoted.tests delete mode 100644 shell/msh_test/msh-bugs/syntax_err.right delete mode 100755 shell/msh_test/msh-bugs/syntax_err.tests delete mode 100644 shell/msh_test/msh-bugs/var_expand_in_assign.right delete mode 100755 shell/msh_test/msh-bugs/var_expand_in_assign.tests delete mode 100644 shell/msh_test/msh-bugs/var_expand_in_redir.right delete mode 100755 shell/msh_test/msh-bugs/var_expand_in_redir.tests delete mode 100644 shell/msh_test/msh-execution/exitcode_EACCES.right delete mode 100755 shell/msh_test/msh-execution/exitcode_EACCES.tests delete mode 100644 shell/msh_test/msh-execution/exitcode_ENOENT.right delete mode 100755 shell/msh_test/msh-execution/exitcode_ENOENT.tests delete mode 100644 shell/msh_test/msh-execution/many_continues.right delete mode 100755 shell/msh_test/msh-execution/many_continues.tests delete mode 100644 shell/msh_test/msh-execution/nested_break.right delete mode 100755 shell/msh_test/msh-execution/nested_break.tests delete mode 100644 shell/msh_test/msh-misc/tick.right delete mode 100755 shell/msh_test/msh-misc/tick.tests delete mode 100644 shell/msh_test/msh-parsing/argv0.right delete mode 100755 shell/msh_test/msh-parsing/argv0.tests delete mode 100644 shell/msh_test/msh-parsing/noeol.right delete mode 100755 shell/msh_test/msh-parsing/noeol.tests delete mode 100644 shell/msh_test/msh-parsing/noeol2.right delete mode 100755 shell/msh_test/msh-parsing/noeol2.tests delete mode 100644 shell/msh_test/msh-parsing/quote1.right delete mode 100755 shell/msh_test/msh-parsing/quote1.tests delete mode 100644 shell/msh_test/msh-parsing/quote2.right delete mode 100755 shell/msh_test/msh-parsing/quote2.tests delete mode 100644 shell/msh_test/msh-parsing/quote3.right delete mode 100755 shell/msh_test/msh-parsing/quote3.tests delete mode 100644 shell/msh_test/msh-parsing/quote4.right delete mode 100755 shell/msh_test/msh-parsing/quote4.tests delete mode 100644 shell/msh_test/msh-vars/star.right delete mode 100755 shell/msh_test/msh-vars/star.tests delete mode 100644 shell/msh_test/msh-vars/var.right delete mode 100755 shell/msh_test/msh-vars/var.tests delete mode 100644 shell/msh_test/msh-vars/var_subst_in_for.right delete mode 100755 shell/msh_test/msh-vars/var_subst_in_for.tests delete mode 100755 shell/msh_test/run-all diff --git a/shell/msh_test/msh-bugs/noeol3.right b/shell/msh_test/msh-bugs/noeol3.right deleted file mode 100644 index 56f8515b7..000000000 --- a/shell/msh_test/msh-bugs/noeol3.right +++ /dev/null @@ -1 +0,0 @@ -hush: syntax error: unterminated " diff --git a/shell/msh_test/msh-bugs/noeol3.tests b/shell/msh_test/msh-bugs/noeol3.tests deleted file mode 100755 index ec958ed7a..000000000 --- a/shell/msh_test/msh-bugs/noeol3.tests +++ /dev/null @@ -1,2 +0,0 @@ -# last line has no EOL! -echo "unterminated \ No newline at end of file diff --git a/shell/msh_test/msh-bugs/process_subst.right b/shell/msh_test/msh-bugs/process_subst.right deleted file mode 100644 index 397bc8067..000000000 --- a/shell/msh_test/msh-bugs/process_subst.right +++ /dev/null @@ -1,3 +0,0 @@ -TESTzzBEST -TEST$(echo zz)BEST -TEST'BEST diff --git a/shell/msh_test/msh-bugs/process_subst.tests b/shell/msh_test/msh-bugs/process_subst.tests deleted file mode 100755 index 21996bc0e..000000000 --- a/shell/msh_test/msh-bugs/process_subst.tests +++ /dev/null @@ -1,3 +0,0 @@ -echo "TEST`echo zz;echo;echo`BEST" -echo "TEST`echo '$(echo zz)'`BEST" -echo "TEST`echo "'"`BEST" diff --git a/shell/msh_test/msh-bugs/read.right b/shell/msh_test/msh-bugs/read.right deleted file mode 100644 index 0e50e2a23..000000000 --- a/shell/msh_test/msh-bugs/read.right +++ /dev/null @@ -1,4 +0,0 @@ -read -cat -echo "REPLY=$REPLY" -REPLY=exec "$1.out" -echo TEST2 >"$2.out" -# bash says: "$@.out": ambiguous redirect -# ash handles it as if it is '$*' - we do the same -echo TEST3 >"$@.out" - -cat abc.out "d e.out" "abc d e.out" - -rm abc.out "d e.out" "abc d e.out" diff --git a/shell/msh_test/msh-execution/exitcode_EACCES.right b/shell/msh_test/msh-execution/exitcode_EACCES.right deleted file mode 100644 index 6e5480b9d..000000000 --- a/shell/msh_test/msh-execution/exitcode_EACCES.right +++ /dev/null @@ -1,2 +0,0 @@ -./: can't execute -126 diff --git a/shell/msh_test/msh-execution/exitcode_EACCES.tests b/shell/msh_test/msh-execution/exitcode_EACCES.tests deleted file mode 100755 index 26b5c6116..000000000 --- a/shell/msh_test/msh-execution/exitcode_EACCES.tests +++ /dev/null @@ -1,2 +0,0 @@ -./ -echo $? diff --git a/shell/msh_test/msh-execution/exitcode_ENOENT.right b/shell/msh_test/msh-execution/exitcode_ENOENT.right deleted file mode 100644 index dd49d2c0c..000000000 --- a/shell/msh_test/msh-execution/exitcode_ENOENT.right +++ /dev/null @@ -1,2 +0,0 @@ -./does_not_exist_for_sure: not found -127 diff --git a/shell/msh_test/msh-execution/exitcode_ENOENT.tests b/shell/msh_test/msh-execution/exitcode_ENOENT.tests deleted file mode 100755 index 7f1b88a99..000000000 --- a/shell/msh_test/msh-execution/exitcode_ENOENT.tests +++ /dev/null @@ -1,2 +0,0 @@ -./does_not_exist_for_sure -echo $? diff --git a/shell/msh_test/msh-execution/many_continues.right b/shell/msh_test/msh-execution/many_continues.right deleted file mode 100644 index d86bac9de..000000000 --- a/shell/msh_test/msh-execution/many_continues.right +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/shell/msh_test/msh-execution/many_continues.tests b/shell/msh_test/msh-execution/many_continues.tests deleted file mode 100755 index 86c729abc..000000000 --- a/shell/msh_test/msh-execution/many_continues.tests +++ /dev/null @@ -1,15 +0,0 @@ -if test $# = 0; then - # Child will kill us in 1 second - "$THIS_SH" "$0" $$ & - - # Loop many, many times - trap 'echo OK; exit 0' 15 - while true; do - continue - done - echo BAD - exit 1 -fi - -sleep 1 -kill $1 diff --git a/shell/msh_test/msh-execution/nested_break.right b/shell/msh_test/msh-execution/nested_break.right deleted file mode 100644 index 4e8b6b0f2..000000000 --- a/shell/msh_test/msh-execution/nested_break.right +++ /dev/null @@ -1,8 +0,0 @@ -A -B -iteration -C -A -B -iteration -D diff --git a/shell/msh_test/msh-execution/nested_break.tests b/shell/msh_test/msh-execution/nested_break.tests deleted file mode 100755 index 1a954d227..000000000 --- a/shell/msh_test/msh-execution/nested_break.tests +++ /dev/null @@ -1,17 +0,0 @@ -# Testcase for http://bugs.busybox.net/view.php?id=846 - -n=0 -while : -do - echo A - while : - do - echo B - break - done - echo iteration - [ $n = 1 ] && break - echo C - n=`expr $n + 1` -done -echo D diff --git a/shell/msh_test/msh-misc/tick.right b/shell/msh_test/msh-misc/tick.right deleted file mode 100644 index 6ed281c75..000000000 --- a/shell/msh_test/msh-misc/tick.right +++ /dev/null @@ -1,2 +0,0 @@ -1 -1 diff --git a/shell/msh_test/msh-misc/tick.tests b/shell/msh_test/msh-misc/tick.tests deleted file mode 100755 index 1f749a9cd..000000000 --- a/shell/msh_test/msh-misc/tick.tests +++ /dev/null @@ -1,4 +0,0 @@ -true -false; echo `echo $?` -true -{ false; echo `echo $?`; } diff --git a/shell/msh_test/msh-parsing/argv0.right b/shell/msh_test/msh-parsing/argv0.right deleted file mode 100644 index d86bac9de..000000000 --- a/shell/msh_test/msh-parsing/argv0.right +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/shell/msh_test/msh-parsing/argv0.tests b/shell/msh_test/msh-parsing/argv0.tests deleted file mode 100755 index f5c40f6fe..000000000 --- a/shell/msh_test/msh-parsing/argv0.tests +++ /dev/null @@ -1,4 +0,0 @@ -if test $# = 0; then - exec "$THIS_SH" "$0" arg -fi -echo OK diff --git a/shell/msh_test/msh-parsing/noeol.right b/shell/msh_test/msh-parsing/noeol.right deleted file mode 100644 index e427984d4..000000000 --- a/shell/msh_test/msh-parsing/noeol.right +++ /dev/null @@ -1 +0,0 @@ -HELLO diff --git a/shell/msh_test/msh-parsing/noeol.tests b/shell/msh_test/msh-parsing/noeol.tests deleted file mode 100755 index a93113a03..000000000 --- a/shell/msh_test/msh-parsing/noeol.tests +++ /dev/null @@ -1,2 +0,0 @@ -# next line has no EOL! -echo HELLO \ No newline at end of file diff --git a/shell/msh_test/msh-parsing/noeol2.right b/shell/msh_test/msh-parsing/noeol2.right deleted file mode 100644 index d00491fd7..000000000 --- a/shell/msh_test/msh-parsing/noeol2.right +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/shell/msh_test/msh-parsing/noeol2.tests b/shell/msh_test/msh-parsing/noeol2.tests deleted file mode 100755 index 1220f056f..000000000 --- a/shell/msh_test/msh-parsing/noeol2.tests +++ /dev/null @@ -1,7 +0,0 @@ -# last line has no EOL! -if true -then - echo 1 -else - echo 2 -fi \ No newline at end of file diff --git a/shell/msh_test/msh-parsing/quote1.right b/shell/msh_test/msh-parsing/quote1.right deleted file mode 100644 index cb382054c..000000000 --- a/shell/msh_test/msh-parsing/quote1.right +++ /dev/null @@ -1 +0,0 @@ -'1' diff --git a/shell/msh_test/msh-parsing/quote1.tests b/shell/msh_test/msh-parsing/quote1.tests deleted file mode 100755 index f55895466..000000000 --- a/shell/msh_test/msh-parsing/quote1.tests +++ /dev/null @@ -1,2 +0,0 @@ -a=1 -echo "'$a'" diff --git a/shell/msh_test/msh-parsing/quote2.right b/shell/msh_test/msh-parsing/quote2.right deleted file mode 100644 index 3bc9edcd6..000000000 --- a/shell/msh_test/msh-parsing/quote2.right +++ /dev/null @@ -1 +0,0 @@ ->1 diff --git a/shell/msh_test/msh-parsing/quote2.tests b/shell/msh_test/msh-parsing/quote2.tests deleted file mode 100755 index bd966f30b..000000000 --- a/shell/msh_test/msh-parsing/quote2.tests +++ /dev/null @@ -1,2 +0,0 @@ -a=1 -echo ">$a" diff --git a/shell/msh_test/msh-parsing/quote3.right b/shell/msh_test/msh-parsing/quote3.right deleted file mode 100644 index 069a46e8f..000000000 --- a/shell/msh_test/msh-parsing/quote3.right +++ /dev/null @@ -1,3 +0,0 @@ -Testing: in $empty"" -.. -Finished diff --git a/shell/msh_test/msh-parsing/quote3.tests b/shell/msh_test/msh-parsing/quote3.tests deleted file mode 100755 index 075e78570..000000000 --- a/shell/msh_test/msh-parsing/quote3.tests +++ /dev/null @@ -1,8 +0,0 @@ -if test $# = 0; then - exec "$THIS_SH" quote3.tests abc "d e" -fi - -echo 'Testing: in $empty""' -empty='' -for a in $empty""; do echo ".$a."; done -echo Finished diff --git a/shell/msh_test/msh-parsing/quote4.right b/shell/msh_test/msh-parsing/quote4.right deleted file mode 100644 index b2901ea97..000000000 --- a/shell/msh_test/msh-parsing/quote4.right +++ /dev/null @@ -1 +0,0 @@ -a b diff --git a/shell/msh_test/msh-parsing/quote4.tests b/shell/msh_test/msh-parsing/quote4.tests deleted file mode 100755 index f1dabfa54..000000000 --- a/shell/msh_test/msh-parsing/quote4.tests +++ /dev/null @@ -1,2 +0,0 @@ -a_b='a b' -echo "$a_b" diff --git a/shell/msh_test/msh-vars/star.right b/shell/msh_test/msh-vars/star.right deleted file mode 100644 index 0ecc55bc2..000000000 --- a/shell/msh_test/msh-vars/star.right +++ /dev/null @@ -1,6 +0,0 @@ -.1. -.abc. -.d. -.e. -.f. -.1 abc d e f. diff --git a/shell/msh_test/msh-vars/star.tests b/shell/msh_test/msh-vars/star.tests deleted file mode 100755 index 5554c4090..000000000 --- a/shell/msh_test/msh-vars/star.tests +++ /dev/null @@ -1,8 +0,0 @@ -if test $# = 0; then - exec "$THIS_SH" star.tests 1 abc 'd e f' -fi -# 'd e f' should be split into 3 separate args: -for a in $*; do echo ".$a."; done - -# must produce .1 abc d e f. -for a in "$*"; do echo ".$a."; done diff --git a/shell/msh_test/msh-vars/var.right b/shell/msh_test/msh-vars/var.right deleted file mode 100644 index 14b2314d9..000000000 --- a/shell/msh_test/msh-vars/var.right +++ /dev/null @@ -1,4 +0,0 @@ -http://busybox.net -http://busybox.net_abc -1 -1 diff --git a/shell/msh_test/msh-vars/var.tests b/shell/msh_test/msh-vars/var.tests deleted file mode 100755 index 0a63696c9..000000000 --- a/shell/msh_test/msh-vars/var.tests +++ /dev/null @@ -1,9 +0,0 @@ -URL=http://busybox.net - -echo $URL -echo ${URL}_abc - -true -false; echo $? -true -{ false; echo $?; } diff --git a/shell/msh_test/msh-vars/var_subst_in_for.right b/shell/msh_test/msh-vars/var_subst_in_for.right deleted file mode 100644 index c8aca1c12..000000000 --- a/shell/msh_test/msh-vars/var_subst_in_for.right +++ /dev/null @@ -1,40 +0,0 @@ -Testing: in x y z -.x. -.y. -.z. -Testing: in u $empty v -.u. -.v. -Testing: in u " $empty" v -.u. -. . -.v. -Testing: in u $empty $empty$a v -.u. -.a. -.v. -Testing: in $a_b -.a. -.b. -Testing: in $* -.abc. -.d. -.e. -Testing: in $@ -.abc. -.d. -.e. -Testing: in -$*- -.-abc. -.d. -.e-. -Testing: in -$@- -.-abc. -.d. -.e-. -Testing: in $a_b -$a_b- -.a. -.b. -.-a. -.b-. -Finished diff --git a/shell/msh_test/msh-vars/var_subst_in_for.tests b/shell/msh_test/msh-vars/var_subst_in_for.tests deleted file mode 100755 index 4d1c11201..000000000 --- a/shell/msh_test/msh-vars/var_subst_in_for.tests +++ /dev/null @@ -1,40 +0,0 @@ -if test $# = 0; then - exec "$THIS_SH" var_subst_in_for.tests abc "d e" -fi - -echo 'Testing: in x y z' -for a in x y z; do echo ".$a."; done - -echo 'Testing: in u $empty v' -empty='' -for a in u $empty v; do echo ".$a."; done - -echo 'Testing: in u " $empty" v' -empty='' -for a in u " $empty" v; do echo ".$a."; done - -echo 'Testing: in u $empty $empty$a v' -a='a' -for a in u $empty $empty$a v; do echo ".$a."; done - -echo 'Testing: in $a_b' -a_b='a b' -for a in $a_b; do echo ".$a."; done - -echo 'Testing: in $*' -for a in $*; do echo ".$a."; done - -echo 'Testing: in $@' -for a in $@; do echo ".$a."; done - -echo 'Testing: in -$*-' -for a in -$*-; do echo ".$a."; done - -echo 'Testing: in -$@-' -for a in -$@-; do echo ".$a."; done - -echo 'Testing: in $a_b -$a_b-' -a_b='a b' -for a in $a_b -$a_b-; do echo ".$a."; done - -echo Finished diff --git a/shell/msh_test/run-all b/shell/msh_test/run-all deleted file mode 100755 index 29f62a5e2..000000000 --- a/shell/msh_test/run-all +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -test -x msh || { - echo "No ./msh - creating a link to ../../busybox" - ln -s ../../busybox msh -} - -PATH="$PWD:$PATH" # for msh -export PATH - -THIS_SH="$PWD/msh" -export THIS_SH - -do_test() -{ - test -d "$1" || return 0 -# echo Running tests in directory "$1" - ( - cd "$1" || { echo "cannot cd $1!"; exit 1; } - for x in run-*; do - test -f "$x" || continue - case "$x" in - "$0"|run-minimal|run-gprof) ;; - *.orig|*~) ;; - #*) echo $x ; sh $x ;; - *) - sh "$x" >"../$1-$x.fail" 2>&1 && \ - { echo "$1/$x: ok"; rm "../$1-$x.fail"; } || echo "$1/$x: fail"; - ;; - esac - done - # Many bash run-XXX scripts just do this, - # no point in duplication it all over the place - for x in *.tests; do - test -x "$x" || continue - name="${x%%.tests}" - test -f "$name.right" || continue -# echo Running test: "$name.right" - { - "$THIS_SH" "./$x" >"$name.xx" 2>&1 - diff -u "$name.xx" "$name.right" >"../$1-$x.fail" && rm -f "$name.xx" "../$1-$x.fail" - } && echo "$1/$x: ok" || echo "$1/$x: fail" - done - ) -} - -# Main part of this script -# Usage: run-all [directories] - -if [ $# -lt 1 ]; then - # All sub directories - modules=`ls -d msh-*` - - for module in $modules; do - do_test $module - done -else - while [ $# -ge 1 ]; do - if [ -d $1 ]; then - do_test $1 - fi - shift - done -fi -- 2.25.1