diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-10 23:48:03 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-10 23:48:03 +0000 |
| commit | 75bccfa375564337bfbd57e5d54f92e155a0b18b (patch) | |
| tree | 87ca1e51928e8838379ff1683d990f259e87de43 /shell | |
| parent | ce4acbbab664e9ab3432189f88b525f10553f674 (diff) | |
| download | busybox-w32-75bccfa375564337bfbd57e5d54f92e155a0b18b.tar.gz busybox-w32-75bccfa375564337bfbd57e5d54f92e155a0b18b.tar.bz2 busybox-w32-75bccfa375564337bfbd57e5d54f92e155a0b18b.zip | |
hush: tweak tests
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush_test/hush-vars/var_posix1.right | 36 | ||||
| -rwxr-xr-x | shell/hush_test/hush-vars/var_posix1.tests | 36 | ||||
| -rwxr-xr-x | shell/hush_test/hush-z_slow/leak_all1.tests | 74 |
3 files changed, 109 insertions, 37 deletions
diff --git a/shell/hush_test/hush-vars/var_posix1.right b/shell/hush_test/hush-vars/var_posix1.right index 702bbca79..373b16ca5 100644 --- a/shell/hush_test/hush-vars/var_posix1.right +++ b/shell/hush_test/hush-vars/var_posix1.right | |||
| @@ -1,19 +1,19 @@ | |||
| 1 | 1 | Empty: | |
| 2 | 2 | Empty: | |
| 3 | 3 | Empty: | |
| 4 | 4 | Empty: | |
| 5 | 5 | Empty: | |
| 6 | 6 | Empty: | |
| 7 | 7 | Empty: | |
| 8 | 8 | Empty: | |
| 9 | 9 | Empty: | |
| 10 | 10 | Empty: | |
| 11 | 11 | Empty: | |
| 12 | 12 | Empty: | |
| 13 | 13 | Empty: | |
| 14 | 14 | Empty: | |
| 15 | 15 | Empty: | |
| 16 | 16 | Empty: | |
| 17 | abcdcd | 17 | abcdcd |
| 18 | abcdcd | 18 | abcdcd |
| 19 | abcdcd | 19 | abcdcd |
| @@ -21,7 +21,7 @@ cdcd | |||
| 21 | babcdcd | 21 | babcdcd |
| 22 | babcdcd | 22 | babcdcd |
| 23 | ababcdcd | 23 | ababcdcd |
| 24 | 24 | Empty: | |
| 25 | ababcd | 25 | ababcd |
| 26 | ababcd | 26 | ababcd |
| 27 | ababcd | 27 | ababcd |
| @@ -29,5 +29,5 @@ abab | |||
| 29 | ababcdc | 29 | ababcdc |
| 30 | ababcdc | 30 | ababcdc |
| 31 | ababcdcd | 31 | ababcdcd |
| 32 | 32 | Empty: | |
| 33 | end | 33 | end |
diff --git a/shell/hush_test/hush-vars/var_posix1.tests b/shell/hush_test/hush-vars/var_posix1.tests index d3205b119..0ce531d69 100755 --- a/shell/hush_test/hush-vars/var_posix1.tests +++ b/shell/hush_test/hush-vars/var_posix1.tests | |||
| @@ -1,24 +1,24 @@ | |||
| 1 | unset var | 1 | unset var |
| 2 | 2 | ||
| 3 | echo ${var#} | 3 | echo Empty:${var#} |
| 4 | echo ${var##} | 4 | echo Empty:${var##} |
| 5 | echo ${var#*} | 5 | echo Empty:${var#*} |
| 6 | echo ${var##*} | 6 | echo Empty:${var##*} |
| 7 | echo ${var%} | 7 | echo Empty:${var%} |
| 8 | echo ${var%%} | 8 | echo Empty:${var%%} |
| 9 | echo ${var%*} | 9 | echo Empty:${var%*} |
| 10 | echo ${var%%*} | 10 | echo Empty:${var%%*} |
| 11 | 11 | ||
| 12 | var= | 12 | var= |
| 13 | 13 | ||
| 14 | echo ${var#} | 14 | echo Empty:${var#} |
| 15 | echo ${var##} | 15 | echo Empty:${var##} |
| 16 | echo ${var#*} | 16 | echo Empty:${var#*} |
| 17 | echo ${var##*} | 17 | echo Empty:${var##*} |
| 18 | echo ${var%} | 18 | echo Empty:${var%} |
| 19 | echo ${var%%} | 19 | echo Empty:${var%%} |
| 20 | echo ${var%*} | 20 | echo Empty:${var%*} |
| 21 | echo ${var%%*} | 21 | echo Empty:${var%%*} |
| 22 | 22 | ||
| 23 | var=ababcdcd | 23 | var=ababcdcd |
| 24 | 24 | ||
| @@ -29,7 +29,7 @@ echo ${var##a*b} | |||
| 29 | echo ${var#?} | 29 | echo ${var#?} |
| 30 | echo ${var##?} | 30 | echo ${var##?} |
| 31 | echo ${var#*} | 31 | echo ${var#*} |
| 32 | echo ${var##*} | 32 | echo Empty:${var##*} |
| 33 | 33 | ||
| 34 | echo ${var%cd} | 34 | echo ${var%cd} |
| 35 | echo ${var%%cd} | 35 | echo ${var%%cd} |
| @@ -38,6 +38,6 @@ echo ${var%%c*d} | |||
| 38 | echo ${var%?} | 38 | echo ${var%?} |
| 39 | echo ${var%%?} | 39 | echo ${var%%?} |
| 40 | echo ${var%*} | 40 | echo ${var%*} |
| 41 | echo ${var%%*} | 41 | echo Empty:${var%%*} |
| 42 | 42 | ||
| 43 | echo end | 43 | echo end |
diff --git a/shell/hush_test/hush-z_slow/leak_all1.tests b/shell/hush_test/hush-z_slow/leak_all1.tests index d244744a6..4c9d41afb 100755 --- a/shell/hush_test/hush-z_slow/leak_all1.tests +++ b/shell/hush_test/hush-z_slow/leak_all1.tests | |||
| @@ -25,6 +25,41 @@ HERE | |||
| 25 | { true; }; echo Doesnt run too >>/foo/bar | 25 | { true; }; echo Doesnt run too >>/foo/bar |
| 26 | fi | 26 | fi |
| 27 | { : /bin/*; } | 27 | { : /bin/*; } |
| 28 | unset var | ||
| 29 | echo >/dev/null ${var#} | ||
| 30 | echo >/dev/null ${var##} | ||
| 31 | echo >/dev/null ${var#*} | ||
| 32 | echo >/dev/null ${var##*} | ||
| 33 | echo >/dev/null ${var%} | ||
| 34 | echo >/dev/null ${var%%} | ||
| 35 | echo >/dev/null ${var%*} | ||
| 36 | echo >/dev/null ${var%%*} | ||
| 37 | var= | ||
| 38 | echo >/dev/null ${var#} | ||
| 39 | echo >/dev/null ${var##} | ||
| 40 | echo >/dev/null ${var#*} | ||
| 41 | echo >/dev/null ${var##*} | ||
| 42 | echo >/dev/null ${var%} | ||
| 43 | echo >/dev/null ${var%%} | ||
| 44 | echo >/dev/null ${var%*} | ||
| 45 | echo >/dev/null ${var%%*} | ||
| 46 | var=ababcdcd | ||
| 47 | echo >/dev/null ${var#ab} | ||
| 48 | echo >/dev/null ${var##ab} | ||
| 49 | echo >/dev/null ${var#a*b} | ||
| 50 | echo >/dev/null ${var##a*b} | ||
| 51 | echo >/dev/null ${var#?} | ||
| 52 | echo >/dev/null ${var##?} | ||
| 53 | echo >/dev/null ${var#*} | ||
| 54 | echo >/dev/null ${var##*} | ||
| 55 | echo >/dev/null ${var%cd} | ||
| 56 | echo >/dev/null ${var%%cd} | ||
| 57 | echo >/dev/null ${var%c*d} | ||
| 58 | echo >/dev/null ${var%%c*d} | ||
| 59 | echo >/dev/null ${var%?} | ||
| 60 | echo >/dev/null ${var%%?} | ||
| 61 | echo >/dev/null ${var%*} | ||
| 62 | echo >/dev/null ${var%%*} | ||
| 28 | set -- par1_$i par2_$i par3_$i par4_$i | 63 | set -- par1_$i par2_$i par3_$i par4_$i |
| 29 | trap "echo trap$i" WINCH | 64 | trap "echo trap$i" WINCH |
| 30 | f() { echo $1; } | 65 | f() { echo $1; } |
| @@ -55,6 +90,41 @@ HERE | |||
| 55 | { true; }; echo Doesnt run too >>/foo/bar | 90 | { true; }; echo Doesnt run too >>/foo/bar |
| 56 | fi | 91 | fi |
| 57 | { : /bin/*; } | 92 | { : /bin/*; } |
| 93 | unset var | ||
| 94 | echo >/dev/null ${var#} | ||
| 95 | echo >/dev/null ${var##} | ||
| 96 | echo >/dev/null ${var#*} | ||
| 97 | echo >/dev/null ${var##*} | ||
| 98 | echo >/dev/null ${var%} | ||
| 99 | echo >/dev/null ${var%%} | ||
| 100 | echo >/dev/null ${var%*} | ||
| 101 | echo >/dev/null ${var%%*} | ||
| 102 | var= | ||
| 103 | echo >/dev/null ${var#} | ||
| 104 | echo >/dev/null ${var##} | ||
| 105 | echo >/dev/null ${var#*} | ||
| 106 | echo >/dev/null ${var##*} | ||
| 107 | echo >/dev/null ${var%} | ||
| 108 | echo >/dev/null ${var%%} | ||
| 109 | echo >/dev/null ${var%*} | ||
| 110 | echo >/dev/null ${var%%*} | ||
| 111 | var=ababcdcd | ||
| 112 | echo >/dev/null ${var#ab} | ||
| 113 | echo >/dev/null ${var##ab} | ||
| 114 | echo >/dev/null ${var#a*b} | ||
| 115 | echo >/dev/null ${var##a*b} | ||
| 116 | echo >/dev/null ${var#?} | ||
| 117 | echo >/dev/null ${var##?} | ||
| 118 | echo >/dev/null ${var#*} | ||
| 119 | echo >/dev/null ${var##*} | ||
| 120 | echo >/dev/null ${var%cd} | ||
| 121 | echo >/dev/null ${var%%cd} | ||
| 122 | echo >/dev/null ${var%c*d} | ||
| 123 | echo >/dev/null ${var%%c*d} | ||
| 124 | echo >/dev/null ${var%?} | ||
| 125 | echo >/dev/null ${var%%?} | ||
| 126 | echo >/dev/null ${var%*} | ||
| 127 | echo >/dev/null ${var%%*} | ||
| 58 | set -- par1_$i par2_$i par3_$i par4_$i | 128 | set -- par1_$i par2_$i par3_$i par4_$i |
| 59 | trap "echo trap$i" WINCH | 129 | trap "echo trap$i" WINCH |
| 60 | f() { echo $1; } | 130 | f() { echo $1; } |
| @@ -62,9 +132,11 @@ HERE | |||
| 62 | : $((i++)) | 132 | : $((i++)) |
| 63 | done | 133 | done |
| 64 | 134 | ||
| 135 | |||
| 65 | memleak | 136 | memleak |
| 66 | kb=$? | 137 | kb=$? |
| 67 | if test $kb -le 4; then | 138 | # Observed some variability, bumped to 12k |
| 139 | if test $kb -le 12; then | ||
| 68 | echo Ok #$kb | 140 | echo Ok #$kb |
| 69 | else | 141 | else |
| 70 | echo "Bad: $kb kb (or more) leaked" | 142 | echo "Bad: $kb kb (or more) leaked" |
