mirror of https://gitee.com/openkylin/linux.git
torture: Consolidate qemu-cmd duration editing into kvm-transform.sh
Currently, kvm-again.sh updates the duration in the "seconds=" comment in the qemu-cmd file, but kvm-transform.sh updates the duration in the actual qemu command arguments. This is an accident waiting to happen. This commit therefore consolidates these updates into kvm-transform.sh. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
parent
03edf700db
commit
a1ab2e89f3
|
@ -155,10 +155,6 @@ do
|
|||
kernel_dir="`echo $qemu_cmd_dir | sed -e 's/\.[0-9]\+$//'`"
|
||||
jitter_dir="`dirname "$kernel_dir"`"
|
||||
kvm-transform.sh "$kernel_dir/bzImage" "$qemu_cmd_dir/console.log" "$jitter_dir" $dur < $T/qemu-cmd > $i
|
||||
if test -n "$dur"
|
||||
then
|
||||
echo "# seconds=$dur" >> $i
|
||||
fi
|
||||
if test -n "$arg_remote"
|
||||
then
|
||||
echo "# TORTURE_KCONFIG_GDB_ARG=''" >> $i
|
||||
|
|
|
@ -44,6 +44,14 @@ fi
|
|||
|
||||
awk -v image="$image" -v consolelog="$consolelog" -v jitter_dir="$jitter_dir" \
|
||||
-v seconds="$seconds" '
|
||||
/^# seconds=/ {
|
||||
if (seconds == "")
|
||||
print $0;
|
||||
else
|
||||
print "# seconds=" seconds;
|
||||
next;
|
||||
}
|
||||
|
||||
/^# TORTURE_JITTER_START=/ {
|
||||
print "# TORTURE_JITTER_START=\". jitterstart.sh " $4 " " jitter_dir " " $6 " " $7;
|
||||
next;
|
||||
|
|
Loading…
Reference in New Issue