diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-04-20 15:01:31 +0530 |
|---|---|---|
| committer | Amit Shah <amit.shah@redhat.com> | 2010-04-20 15:09:56 +0530 |
| commit | 25a80e7e79868f1327f469f8d07175d8ed0f5b56 (patch) | |
| tree | 7c8dbc290205650b2143b53495f2070c236e044a | |
| parent | eaed095aa4fded6b9a61b6c62e43d6f61338abe9 (diff) | |
| download | test-virtserial-25a80e7e79868f1327f469f8d07175d8ed0f5b56.tar.gz test-virtserial-25a80e7e79868f1327f469f8d07175d8ed0f5b56.tar.xz test-virtserial-25a80e7e79868f1327f469f8d07175d8ed0f5b56.zip | |
run-test: Split common code in a function
All the tests for combinations of new and old qemu and kernels used
similar code; split it off into a function.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
| -rwxr-xr-x | run-test.sh | 56 |
1 files changed, 18 insertions, 38 deletions
diff --git a/run-test.sh b/run-test.sh index 7b3a3fc..deec6b6 100755 --- a/run-test.sh +++ b/run-test.sh @@ -32,23 +32,27 @@ MISCOPT="-net none -enable-kvm -m 1G -serial file:/tmp/amit/test-serial.log \ KVMOPT="-smp $VCPUS" SNAPSHOT="-snapshot" -# -- Iteration 1: new kernel, new qemu -- -QEMU_OPTS="$GUEST $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT \ - $SNAPSHOT $KVMOPT" +function do_test { + pkill -9 auto-virtserial + pkill -9 qemu -echo $QEMU $QEMU_OPTS + echo $QEMU $QEMU_OPTS + $QEMU $QEMU_OPTS & -pkill -9 auto-virtserial -pkill -9 qemu + # Give some time for the guest to come up + sleep 5 -$QEMU $QEMU_OPTS & + > /tmp/amit/guest-big-file + > /tmp/amit/guest-csumfile + time ./auto-virtserial + pkill qemu +} -sleep 5 +# -- Iteration 1: new kernel, new qemu -- +QEMU_OPTS="$GUEST $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT \ + $SNAPSHOT $KVMOPT" -> /tmp/amit/guest-big-file -> /tmp/amit/guest-csumfile -time ./auto-virtserial -pkill qemu +do_test #exit; # -- Iteration 2: old kernel, new qemu -- @@ -56,19 +60,7 @@ sleep 5 QEMU_OPTS="$GUEST $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT $KVMOPT" -echo $QEMU $QEMU_OPTS - -pkill -9 auto-virtserial -pkill -9 qemu - -$QEMU $QEMU_OPTS & - -sleep 5 - -> /tmp/amit/guest-big-file -> /tmp/amit/guest-csumfile -time ./auto-virtserial -pkill qemu +do_test # -- Iteration 3: new kernel, old qemu -- sleep 5 @@ -78,16 +70,4 @@ VIRTSER="-virtioconsole unix:/tmp/amit/test0,server,nowait" QEMU_OPTS="$GUEST $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT" -echo $QEMU_OLD $QEMU_OPTS - -pkill -9 auto-virtserial -pkill -9 qemu - -$QEMU_OLD $QEMU_OPTS & - -sleep 5 - -> /tmp/amit/guest-big-file -> /tmp/amit/guest-csumfile -time ./auto-virtserial -pkill qemu +do_test |