X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=testsuite%2Fruntest;h=c7f353690145c5e947fcded3af0da9fe8a1960e9;hb=731f81cbed87db586474582bae1236853abc22ef;hp=4ac1d3bfed0b637ab5fe61383c26e2145446dc8c;hpb=23bc647b357343b64021abf46e8a8c1aeddfbf41;p=oweals%2Fbusybox.git

diff --git a/testsuite/runtest b/testsuite/runtest
index 4ac1d3bfe..c7f353690 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -4,7 +4,9 @@
 [ -n "$bindir" ] || bindir=$(dirname $(pwd))
 PATH=$bindir:$PATH
 
-run_applet_testcase ()
+# Run old-style test.
+
+function run_applet_testcase
 {
 	local applet=$1
 	local testcase=$2
@@ -37,7 +39,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,18 +79,35 @@ 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
 
+# Populate a directory with links to all busybox applets
+
+LINKSDIR="${bindir}/runtest-tempdir-links"
+rm -rf "$LINKSDIR" 2>/dev/null
+mkdir "$LINKSDIR"
+for i in $(sed 's@/[a-z0-9/\[]*/@@' $bindir/busybox.links 2>/dev/null)
+do
+	ln -s $bindir/busybox "$LINKSDIR"/$i
+done
+
+# Set up option flags so tests can be selective.
+
+configfile=${bindir:-../../}/.config
+export OPTIONFLAGS=:$(echo $(sed -nr 's/^CONFIG_(.*)=.*/\1/p' $configfile) | sed 's/ /:/g')
+
 for applet in $applets; do
 	if [ "$applet" = "links" ]; then continue; fi
 	if [ "$applet" != "CVS" -a -d "$srcdir/$applet" ]; then
@@ -98,21 +117,21 @@ for applet in $applets; do
 			status=1
 		fi
 	fi
+
+	# Is this a new-style test?
 	applet=$(echo "$applet" | sed -n 's/\.tests$//p')
 	if [ ${#applet} -ne 0 ]
 	then
-		if [ -d links ]; then
-			rm -f links/"$applet" 
-		else
-			mkdir links 2> /dev/null
+		if [ ! -h "$LINKSDIR/$applet" ] && [ ${applet:0:4} != "all_" ]
+		then
+			echo "SKIPPED: $applet (not built)"
+			continue
 		fi
-		ln -s ${bindir:-../..}/busybox links/"$applet"
-		PATH="$srcdir:$PATH" COMMAND="links/$applet" \
+		PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
 			"${srcdir:-.}/$applet".tests
 		if [ $? -ne 0 ]; then status=1; fi
 	fi
 
 done
-rm -f links/*
-rmdir links
+rm -rf "$LINKSDIR"
 exit $status