1 files changed, 9 insertions, 34 deletions

diff --git a/rcutorture/bin/kvm-recheck.sh b/rcutorture/bin/kvm-recheck.sh
index 3f6c9b7..baef09f 100755
--- a/rcutorture/bin/kvm-recheck.sh
+++ b/rcutorture/bin/kvm-recheck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Given the results directories for previous KVM-based torture runs,
+# Given the results directories for previous KVM runs of rcutorture,
 # check the build and console output for errors.  Given a directory
 # containing results directories, this recursively checks them all.
 #
@@ -25,45 +25,20 @@
 # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 
 PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
-. tools/testing/selftests/rcutorture/bin/functions.sh
 for rd in "$@"
 do
-	firsttime=1
 	dirs=`find $rd -name Make.defconfig.out -print | sort | sed -e 's,/[^/]*$,,' | sort -u`
 	for i in $dirs
 	do
-		if test -n "$firsttime"
+		configfile=`echo $i | sed -e 's/^.*\///'`
+		echo $configfile
+		configcheck.sh $i/.config $i/ConfigFragment
+		parse-build.sh $i/Make.out $configfile
+		parse-rcutorture.sh $i/console.log $configfile
+		parse-console.sh $i/console.log $configfile
+		if test -r $i/Warnings
 		then
-			firsttime=""
-			resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'`
-			head -1 $resdir/log
-		fi
-		TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
-		kvm-recheck-${TORTURE_SUITE}.sh $i
-		if test -f "$i/console.log"
-		then
-			configcheck.sh $i/.config $i/ConfigFragment
-			parse-build.sh $i/Make.out $configfile
-			parse-torture.sh $i/console.log $configfile
-			parse-console.sh $i/console.log $configfile
-			if test -r $i/Warnings
-			then
-				cat $i/Warnings
-			fi
-		else
-			if test -f "$i/qemu-cmd"
-			then
-				print_bug qemu failed
-				echo "   $i"
-			elif test -f "$i/buildonly"
-			then
-				echo Build-only run, no boot/test
-				configcheck.sh $i/.config $i/ConfigFragment
-				parse-build.sh $i/Make.out $configfile
-			else
-				print_bug Build failed
-				echo "   $i"
-			fi
+			cat $i/Warnings
 		fi
 	done
 done