torture: Clean up diagnostics from --buildonly runs
Currently the post-processing complains about the lack of rcutorture output when --buildonly is set and also emits misleading messages about kernels being started and finishing. This commit suppresses these complaints and messages. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
This commit is contained in:
parent
57e60d0b9e
commit
9bee2c6fb4
|
@ -54,10 +54,16 @@ do
|
||||||
if test -f "$i/qemu-cmd"
|
if test -f "$i/qemu-cmd"
|
||||||
then
|
then
|
||||||
print_bug qemu failed
|
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
|
else
|
||||||
print_bug Build failed
|
print_bug Build failed
|
||||||
fi
|
|
||||||
echo " $i"
|
echo " $i"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
|
@ -132,7 +132,10 @@ boot_args=$6
|
||||||
|
|
||||||
cd $KVM
|
cd $KVM
|
||||||
kstarttime=`awk 'BEGIN { print systime() }' < /dev/null`
|
kstarttime=`awk 'BEGIN { print systime() }' < /dev/null`
|
||||||
|
if test -z "$TORTURE_BUILDONLY"
|
||||||
|
then
|
||||||
echo ' ---' `date`: Starting kernel
|
echo ' ---' `date`: Starting kernel
|
||||||
|
fi
|
||||||
|
|
||||||
# Generate -smp qemu argument.
|
# Generate -smp qemu argument.
|
||||||
qemu_args="-nographic $qemu_args"
|
qemu_args="-nographic $qemu_args"
|
||||||
|
@ -158,12 +161,13 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
|
||||||
# Generate kernel-version-specific boot parameters
|
# Generate kernel-version-specific boot parameters
|
||||||
boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
|
boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
|
||||||
|
|
||||||
echo $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
|
|
||||||
if test -n "$TORTURE_BUILDONLY"
|
if test -n "$TORTURE_BUILDONLY"
|
||||||
then
|
then
|
||||||
echo Build-only run specified, boot/test omitted.
|
echo Build-only run specified, boot/test omitted.
|
||||||
|
touch $resdir/buildonly
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
echo $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
|
||||||
( $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &
|
( $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &
|
||||||
qemu_pid=$!
|
qemu_pid=$!
|
||||||
commandcompleted=0
|
commandcompleted=0
|
||||||
|
|
|
@ -340,12 +340,18 @@ function dump(first, pastlast)
|
||||||
for (j = 1; j < jn; j++) {
|
for (j = 1; j < jn; j++) {
|
||||||
builddir=KVM "/b" j
|
builddir=KVM "/b" j
|
||||||
print "rm -f " builddir ".ready"
|
print "rm -f " builddir ".ready"
|
||||||
print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`";
|
print "if test -z \"$TORTURE_BUILDONLY\""
|
||||||
print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date` >> " rd "/log";
|
print "then"
|
||||||
|
print "\techo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`";
|
||||||
|
print "\techo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date` >> " rd "/log";
|
||||||
|
print "fi"
|
||||||
}
|
}
|
||||||
print "wait"
|
print "wait"
|
||||||
print "echo ---- All kernel runs complete. `date`";
|
print "if test -z \"$TORTURE_BUILDONLY\""
|
||||||
print "echo ---- All kernel runs complete. `date` >> " rd "/log";
|
print "then"
|
||||||
|
print "\techo ---- All kernel runs complete. `date`";
|
||||||
|
print "\techo ---- All kernel runs complete. `date` >> " rd "/log";
|
||||||
|
print "fi"
|
||||||
for (j = 1; j < jn; j++) {
|
for (j = 1; j < jn; j++) {
|
||||||
builddir=KVM "/b" j
|
builddir=KVM "/b" j
|
||||||
print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:";
|
print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:";
|
||||||
|
@ -385,10 +391,7 @@ echo
|
||||||
echo
|
echo
|
||||||
echo " --- `date` Test summary:"
|
echo " --- `date` Test summary:"
|
||||||
echo Results directory: $resdir/$ds
|
echo Results directory: $resdir/$ds
|
||||||
if test -z "$TORTURE_BUILDONLY"
|
|
||||||
then
|
|
||||||
kvm-recheck.sh $resdir/$ds
|
kvm-recheck.sh $resdir/$ds
|
||||||
fi
|
|
||||||
___EOF___
|
___EOF___
|
||||||
|
|
||||||
if test "$dryrun" = script
|
if test "$dryrun" = script
|
||||||
|
@ -403,7 +406,7 @@ then
|
||||||
sed -e 's/:.*$//' -e 's/^echo //'
|
sed -e 's/:.*$//' -e 's/^echo //'
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
# Not a dryru, so run the script.
|
# Not a dryrun, so run the script.
|
||||||
sh $T/script
|
sh $T/script
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue