diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-12 14:53:44 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-12 14:53:44 +0200 |
| commit | 19679784c03089c585c609335389f034172a11ff (patch) | |
| tree | aedcbd8ba735f8036c60b038d3c6465fbe78fdd2 /shell | |
| parent | 09516066d4fb12d1be1c895c072bf481da97520a (diff) | |
| download | busybox-w32-19679784c03089c585c609335389f034172a11ff.tar.gz busybox-w32-19679784c03089c585c609335389f034172a11ff.tar.bz2 busybox-w32-19679784c03089c585c609335389f034172a11ff.zip | |
hush tests: remove the requirement that .config is in ../..
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush.c | 1 | ||||
| -rwxr-xr-x | shell/hush_test/run-all | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c index d7b479d64..f49630a75 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | * TODOs: | 58 | * TODOs: |
| 59 | * grep for "TODO" and fix (some of them are easy) | 59 | * grep for "TODO" and fix (some of them are easy) |
| 60 | * builtins: ulimit | 60 | * builtins: ulimit |
| 61 | * special variables (PWD etc) | ||
| 61 | * follow IFS rules more precisely, including update semantics | 62 | * follow IFS rules more precisely, including update semantics |
| 62 | * export builtin should be special, its arguments are assignments | 63 | * export builtin should be special, its arguments are assignments |
| 63 | * and therefore expansion of them should be "one-word" expansion: | 64 | * and therefore expansion of them should be "one-word" expansion: |
diff --git a/shell/hush_test/run-all b/shell/hush_test/run-all index 470adaa9b..cde841e66 100755 --- a/shell/hush_test/run-all +++ b/shell/hush_test/run-all | |||
| @@ -13,14 +13,20 @@ test -x hush || { | |||
| 13 | echo "No ./hush - creating a link to ../../busybox" | 13 | echo "No ./hush - creating a link to ../../busybox" |
| 14 | ln -s ../../busybox hush | 14 | ln -s ../../busybox hush |
| 15 | } | 15 | } |
| 16 | if test -e ../../.config ; then | 16 | if test ! -e .config; then |
| 17 | eval $(sed -e '/^#/d' -e '/^$/d' -e 's:^:export :' ../../.config) | 17 | if test -f ../../.config; then |
| 18 | cp ../../.config . || exit 1 | ||
| 19 | else | ||
| 20 | echo "Missing .config file" | ||
| 21 | exit 1 | ||
| 22 | fi | ||
| 18 | fi | 23 | fi |
| 24 | eval $(sed -e '/^#/d' -e '/^$/d' -e 's:^:export :' .config) | ||
| 19 | 25 | ||
| 20 | PATH="$PWD:$PATH" # for hush and recho/zecho/printenv | 26 | PATH="`pwd`:$PATH" # for hush and recho/zecho/printenv |
| 21 | export PATH | 27 | export PATH |
| 22 | 28 | ||
| 23 | THIS_SH="$PWD/hush" | 29 | THIS_SH="`pwd`/hush" |
| 24 | export THIS_SH | 30 | export THIS_SH |
| 25 | 31 | ||
| 26 | do_test() | 32 | do_test() |
