diff options
| author | Ron Yorston | 2018-02-09 09:01:19 +0000 |
|---|---|---|
| committer | Denys Vlasenko | 2018-02-12 15:32:02 +0100 |
| commit | ecaec1dbecda67e5b740694878c0780eb4347d26 (patch) | |
| tree | 950dac8ecc0efd67affc76d330883c6d0c1bc065 /testsuite/busybox.tests | |
| parent | 7f441403cbcb6cce864bae66e1fc7bb626954e04 (diff) | |
| download | busybox-ecaec1dbecda67e5b740694878c0780eb4347d26.zip busybox-ecaec1dbecda67e5b740694878c0780eb4347d26.tar.gz | |
testsuite: update busybox and bzcat tests
Test scripts that use CONFIG_* variables need to source .config.
Since this wasn't being done for busybox many tests were skipped.
As a result new failures due to changes in help output were missed.
Also remove some unnecessary echos in the bzcat script.
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite/busybox.tests')
| -rwxr-xr-x | testsuite/busybox.tests | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests index 545cad5..beb1744 100755 --- a/testsuite/busybox.tests +++ b/testsuite/busybox.tests @@ -5,6 +5,7 @@ # Licensed under GPLv2, see file LICENSE in this source tree. . ./testing.sh +test -f "$bindir/.config" && . "$bindir/.config" ln -s `which busybox` unknown @@ -18,29 +19,24 @@ test x"$CONFIG_BUSYBOX" = x"y" \ HELPDUMP=`true | busybox 2>&1 | cat` -# We need to test under calling the binary under other names. - optional FEATURE_VERBOSE_USAGE -testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" "" +testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" "" SKIP= ln -s `which busybox` busybox-suffix for i in busybox ./busybox-suffix do - # The gratuitous "\n"s are due to a shell idiosyncrasy: - # environment variables seem to strip trailing whitespace. - - testing "" "$i" "$HELPDUMP\n\n" "" "" + testing "$i" "$i 2>&1 | cat" "$HELPDUMP\n" "" "" testing "$i unknown" "$i unknown 2>&1" \ "unknown: applet not found\n" "" "" - testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n\n" "" "" + testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n" "" "" optional FEATURE_VERBOSE_USAGE CAT testing "" "$i cat" "moo" "" "moo" - testing "$i --help cat" "$i --help cat 2>&1 | grep print" \ - "Concatenate FILEs and print them to stdout\n" "" "" + testing "$i --help cat" "$i --help cat 2>&1 | grep Print" \ + "Print FILEs to stdout\n" "" "" SKIP= testing "$i --help unknown" "$i --help unknown 2>&1" \ |