Commit 315957ca authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

torture: Prepare for splitting qemu execution from kvm-test-1-run.sh 



Distributed execution of rcutorture is eased if the qemu execution can
be split from the building of the kernel, as this allows target systems
to be used that are not set up to build kernels.  It also avoids issues
with toolchain version skew across the cluster, aside of course from
qemu and KVM version skew.

This commit therefore records needed data as comments in the qemu-cmd file
and moves recording of the starting time to just before qemu is launched.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent bc407358

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ seconds=$4 
qemu_args=$5

boot_args=$6



kstarttime=`gawk 'BEGIN { print systime() }' < /dev/null`

if test -z "$TORTURE_BUILDONLY"

then

	echo ' ---' `date`: Starting kernel
@@ -158,6 +157,8 @@ then 
	boot_args="$boot_args $TORTURE_BOOT_GDB_ARG"

fi

echo $QEMU $qemu_args -m $TORTURE_QEMU_MEM -kernel $KERNEL -append \"$qemu_append $boot_args\" $TORTURE_QEMU_GDB_ARG > $resdir/qemu-cmd

echo "# TORTURE_SHUTDOWN_GRACE=$TORTURE_SHUTDOWN_GRACE" >> $resdir/qemu-cmd

echo "# seconds=$seconds" >> $resdir/qemu-cmd



if test -n "$TORTURE_BUILDONLY"

then
@@ -174,6 +175,7 @@ echo 'echo $! > $resdir/qemu_pid' >> $T/qemu-cmd 
echo "NOTE: $QEMU either did not run or was interactive" > $resdir/console.log



# Attempt to run qemu

kstarttime=`gawk 'BEGIN { print systime() }' < /dev/null`

( . $T/qemu-cmd; wait `cat  $resdir/qemu_pid`; echo $? > $resdir/qemu-retval ) &

commandcompleted=0

if test -z "$TORTURE_KCONFIG_GDB_ARG"