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

torture: Abstract end-of-run summary 



This commit abstractst the end-of-run summary from kvm-again.sh, and,
while in the area, brings its format into line with that of kvm.sh.

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

tools/testing/selftests/rcutorture/bin/kvm-again.sh

+3 −8
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ then 
	usage

fi

rm -f "$rundir"/*/{console.log,console.log.diags,qemu_pid,qemu-retval,Warnings,kvm-test-1-run.sh.out,kvm-test-1-run-qemu.sh.out,vmlinux} "$rundir"/log

touch "$rundir/log"

echo $scriptname $args | tee -a "$rundir/log"

echo $oldrun > "$rundir/re-run"

if ! test -d "$rundir/../../bin"

then
@@ -178,12 +180,5 @@ then 
	echo ---- Dryrun complete, directory: $rundir | tee -a "$rundir/log"

else

	( cd "$rundir"; sh $T/runbatches.sh )

	kcsan-collapse.sh "$rundir" | tee -a "$rundir/log"

	echo | tee -a "$rundir/log"

	echo ---- Results directory: $rundir | tee -a "$rundir/log"

	kvm-recheck.sh "$rundir" > $T/kvm-recheck.sh.out 2>&1

	ret=$?

	cat $T/kvm-recheck.sh.out | tee -a "$rundir/log"

	echo " --- Done at `date` (`get_starttime_duration $starttime`) exitcode $ret" | tee -a "$rundir/log"

	exit $ret

	kvm-end-run-stats.sh "$rundir" "$starttime"

fi

tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh

0 → 100755
+40 −0
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0+

#

# Check the status of the specified run.

#

# Usage: kvm-end-run-stats.sh /path/to/run starttime

#

# Copyright (C) 2021 Facebook, Inc.

#

# Authors: Paul E. McKenney <paulmck@kernel.org>



# scriptname=$0

# args="$*"

rundir="$1"

if ! test -d "$rundir"

then

	echo kvm-end-run-stats.sh: Specified run directory does not exist: $rundir

	exit 1

fi



T=${TMPDIR-/tmp}/kvm-end-run-stats.sh.$$

trap 'rm -rf $T' 0

mkdir $T



KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

. functions.sh

default_starttime="`get_starttime`"

starttime="${2-default_starttime}"



echo | tee -a "$rundir/log"

echo | tee -a "$rundir/log"

echo " --- `date` Test summary:" | tee -a "$rundir/log"

echo Results directory: $rundir | tee -a "$rundir/log"

kcsan-collapse.sh "$rundir" | tee -a "$rundir/log"

kvm-recheck.sh "$rundir" > $T/kvm-recheck.sh.out 2>&1

ret=$?

cat $T/kvm-recheck.sh.out | tee -a "$rundir/log"

echo " --- Done at `date` (`get_starttime_duration $starttime`) exitcode $ret" | tee -a "$rundir/log"

exit $ret