Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

torture: Place console.log files correctly from the get-go 



Currently, the console output files ("console.log") are placed in the
build directory initially, then copied to the results directory.
One problem with this is if a qemu refuses to die in a timely fashion
after a kernel hang, it will continue to write after the next qemu
starts up, resulting in confusing output from the old instance of
qemu.  This commit prevents such confusion by placing the console.log
files into the results directory to begin with, so that a given instance
of qemu is always writing only to its own console.log file.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 5708c647

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

+2 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ fi 
qemu_args="`specify_qemu_cpus "$QEMU" "$qemu_args" "$cpu_count"`"



# Generate architecture-specific and interaction-specific qemu arguments

qemu_args="$qemu_args `identify_qemu_args "$QEMU" "$builddir/console.log"`"

qemu_args="$qemu_args `identify_qemu_args "$QEMU" "$resdir/console.log"`"



# Generate qemu -append arguments

qemu_append="`identify_qemu_append "$QEMU"`"
@@ -166,7 +166,7 @@ then 
	touch $resdir/buildonly

	exit 0

fi

echo "NOTE: $QEMU either did not run or was interactive" > $builddir/console.log

echo "NOTE: $QEMU either did not run or was interactive" > $resdir/console.log

echo $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd

( $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &

qemu_pid=$!
@@ -222,6 +222,5 @@ then 
	done

fi



cp $builddir/console.log $resdir

parse-torture.sh $resdir/console.log $title

parse-console.sh $resdir/console.log $title