From: Michal Simek <[email protected]> leak_argv1 test: ps -o is supported in busybox only with CONFIG_DESKTOP option.
negate test: There were hardcoded path to /usr/bin/printf but when is CONFIG_INSTALL_NO_USR enable is printf in /bin folder. Signed-off-by: Michal Simek <[email protected]> --- shell/hush_test/hush-leak/leak_argv1.tests | 1 + shell/hush_test/hush-parsing/negate.tests | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/shell/hush_test/hush-leak/leak_argv1.tests b/shell/hush_test/hush-leak/leak_argv1.tests index 34991ce..6507146 100755 --- a/shell/hush_test/hush-leak/leak_argv1.tests +++ b/shell/hush_test/hush-leak/leak_argv1.tests @@ -1,3 +1,4 @@ +test "$CONFIG_DESKTOP" = "y" || exit 77 pid=$$ # Warm up diff --git a/shell/hush_test/hush-parsing/negate.tests b/shell/hush_test/hush-parsing/negate.tests index c25127d..e8f4624 100755 --- a/shell/hush_test/hush-parsing/negate.tests +++ b/shell/hush_test/hush-parsing/negate.tests @@ -9,7 +9,12 @@ if ! false; then ! false; echo $?; fi echo $? for a in ! a b c; do echo $a; done for a in ! a b c; do ! printf "$a "; echo $?; done -for a in ! a b c; do ! /usr/bin/printf "$a "; echo $?; done + +if test "$CONFIG_INSTALL_NO_USR" = "y" ; then + for a in ! a b c; do ! /bin/printf "$a "; echo $?; done +else + for a in ! a b c; do ! /usr/bin/printf "$a "; echo $?; done +fi for a in ! a b c; do ! printf "$a " | false; echo $?; done for a in ! a b c; do ! printf "$a " | true; echo $?; done for a in ! a b c; do ! { printf "$a " | false; }; echo $?; done -- 1.5.5.1 _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
