From ecaec1dbecda67e5b740694878c0780eb4347d26 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Fri, 9 Feb 2018 09:01:19 +0000 Subject: 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 Signed-off-by: Denys Vlasenko --- testsuite/busybox.tests | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'testsuite/busybox.tests') diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests index 545cad5c0..beb17440c 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" \ -- cgit v1.2.3