From 7ade6d1fc028270b3bf9031e2271a630aab7ecc2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 28 Jul 2014 03:15:36 +0400
Subject: [PATCH] Use busybox as shell name in place of bb

Conflicts:
	tests/test_shells/test.sh
---
 tests/test_shells/{bb.ok => busybox.ok}       |  0
 tests/test_shells/{input.bb => input.busybox} |  0
 tests/test_shells/test.sh                     | 16 ++++------------
 3 files changed, 4 insertions(+), 12 deletions(-)
 rename tests/test_shells/{bb.ok => busybox.ok} (100%)
 rename tests/test_shells/{input.bb => input.busybox} (100%)

diff --git a/tests/test_shells/bb.ok b/tests/test_shells/busybox.ok
similarity index 100%
rename from tests/test_shells/bb.ok
rename to tests/test_shells/busybox.ok
diff --git a/tests/test_shells/input.bb b/tests/test_shells/input.busybox
similarity index 100%
rename from tests/test_shells/input.bb
rename to tests/test_shells/input.busybox
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index 4a741aed..a1c1a61b 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -46,15 +46,7 @@ run_test() {
 	test "x$ONLY_SHELL" = "x" || test "x$ONLY_SHELL" = "x$SH" || return 0
 
 	if ! which "${SH}" ; then
-		if test "x${SH}" = "xbb" ; then
-			if ! which busybox ; then
-				return 0
-			fi
-			shift
-			ARGS=( busybox ash "$@" )
-		else
-			return 0
-		fi
+		return 0
 	fi
 
 	export TEST_TYPE
@@ -108,8 +100,8 @@ run_test() {
 			dash)
 				# ?
 				;;
-			bb)
-				bb --help
+			busybox)
+				busybox --help
 				;;
 			*)
 				${SH} --version
@@ -205,7 +197,7 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
 			FAILED=1
 		fi
 
-		if ! run_test $TEST_TYPE bb -i ; then
+		if ! run_test $TEST_TYPE busybox ash -i ; then
 			FAILED=1
 		fi