diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rwxr-xr-x | testsuite/runtest | 6 | ||||
| -rwxr-xr-x | testsuite/testing.sh | 10 |
3 files changed, 20 insertions, 8 deletions
@@ -216,9 +216,19 @@ uninstall: busybox.links install-hardlinks: $(top_srcdir)/applets/install.sh busybox busybox.links $(SHELL) $< $(PREFIX) --hardlinks +# see if we are in verbose mode +KBUILD_VERBOSE := +ifdef V + ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE := $(V) + endif +endif +ifneq ($(strip $(KBUILD_VERBOSE)),) + CHECK_VERBOSE := -v +endif check test: busybox bindir=$(top_builddir) srcdir=$(top_srcdir)/testsuite \ - $(top_srcdir)/testsuite/runtest + $(top_srcdir)/testsuite/runtest $(CHECK_VERBOSE) sizes: -rm -f busybox diff --git a/testsuite/runtest b/testsuite/runtest index 4ac1d3bfe..9fd2d0f13 100755 --- a/testsuite/runtest +++ b/testsuite/runtest @@ -37,7 +37,7 @@ run_applet_testcase () if [ $? != 0 ] ; then echo FAIL: $testname - if [ "$verbose" = 1 ]; then + if [ $verbose -gt 0 ]; then cat .logfile.txt #exit 1; fi; @@ -77,14 +77,16 @@ run_applet_tests () status=0 +verbose=0 if [ x"$1" = x"-v" ]; then verbose=1 + export VERBOSE=$verbose shift fi if [ $# -ne 0 ]; then - applets="$@" + applets=$(cd $srcdir ; for i in $@; do ls ${i}* ; done) else applets=$(ls $srcdir) fi diff --git a/testsuite/testing.sh b/testsuite/testing.sh index b7c85c227..83727f6d3 100755 --- a/testsuite/testing.sh +++ b/testsuite/testing.sh @@ -54,7 +54,7 @@ config_is_set () # The testing function -testing() +testing () { if [ $# -ne 5 ] then @@ -62,11 +62,11 @@ testing() exit fi - if [ "$debug" = "1" ] ; then + if [ $debug -eq 1 ] ; then set -x fi - if [ -n "$_BB_CONFIG_DEP" ] && [ "${force}" = "0" ] + if [ -n "$_BB_CONFIG_DEP" ] && [ ${force} -eq 0 ] then if ! config_is_set "$_BB_CONFIG_DEP" then @@ -85,7 +85,7 @@ testing() then ((FAILCOUNT++)) echo "FAIL: $1" - if [ "$verbose" = "1" ] + if [ $verbose -eq 1 ] then diff -u expected actual fi @@ -94,7 +94,7 @@ testing() fi rm -f input expected actual - if [ "$debug" = "1" ] ; then + if [ $debug -eq 1 ] ; then set +x fi |