summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorDenys Vlasenko2016-06-19 18:15:33 +0200
committerDenys Vlasenko2016-06-19 18:15:33 +0200
commit015db5800ca7c6dd2d201eacb2951e72e6782b30 (patch)
tree0fe9b90c782f2ac831f30793e384b07bd690b3b3 /testsuite
parentce824aecf216536beed00d7817a614ffb8572239 (diff)
downloadbusybox-015db5800ca7c6dd2d201eacb2951e72e6782b30.zip
busybox-015db5800ca7c6dd2d201eacb2951e72e6782b30.tar.gz
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/busybox.tests16
-rw-r--r--testsuite/du/du-m-works2
2 files changed, 11 insertions, 7 deletions
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 04fea3e..545cad5 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -6,6 +6,16 @@
. ./testing.sh
+ln -s `which busybox` unknown
+
+testing "busybox as unknown name" "./unknown 2>&1" \
+ "unknown: applet not found\n" "" ""
+rm unknown
+
+# We need busybox --help to be enabled for the rest of tests
+test x"$CONFIG_BUSYBOX" = x"y" \
+|| { echo "SKIPPED: busybox --help"; exit 0; }
+
HELPDUMP=`true | busybox 2>&1 | cat`
# We need to test under calling the binary under other names.
@@ -38,10 +48,4 @@ do
done
rm busybox-suffix
-ln -s `which busybox` unknown
-
-testing "busybox as unknown name" "./unknown 2>&1" \
- "unknown: applet not found\n" "" ""
-rm unknown
-
exit $FAILCOUNT
diff --git a/testsuite/du/du-m-works b/testsuite/du/du-m-works
index 9fa7437..c96c3b3 100644
--- a/testsuite/du/du-m-works
+++ b/testsuite/du/du-m-works
@@ -1,4 +1,4 @@
# FEATURE: CONFIG_FEATURE_HUMAN_READABLE
dd if=/dev/zero of=file bs=1M count=1 2>/dev/null
-test x"`busybox du -m .`" = x"1 ."
+test x"`busybox du -m file`" = x"1 ."