summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2015-06-12 14:27:14 +0300
committerRiku Voipio <riku.voipio@linaro.org>2015-06-12 14:27:14 +0300
commit109a5807bf04fe2a48df78c67b0ceb790c29bbcd (patch)
treebec5fcc532a81f61eff9590d3d366bd1fa186703 /common
parent580919512690b9f0802ac8045eb39a64aa7262af (diff)
downloadtest-definitions-pipe-109a5807bf04fe2a48df78c67b0ceb790c29bbcd.tar.gz
kvm: fix unreviewed commit
Somehow a patch slipped directly to test-definitions without gerrit. To make matters worse this patch was broken. This patch should bring proper systemd support for kvm testcases. Change-Id: If7d01f0f5c39b6e4f8b56c5c0bbcbd028a55ae45 Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'common')
-rwxr-xr-xcommon/scripts/kvm/test-kvm.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/scripts/kvm/test-kvm.sh b/common/scripts/kvm/test-kvm.sh
index 0ae3019..b53de5b 100755
--- a/common/scripts/kvm/test-kvm.sh
+++ b/common/scripts/kvm/test-kvm.sh
@@ -35,7 +35,7 @@ tamper_guest()
sleep 2
mount /dev/nbd0p2 /mnt/
- if [ -x /lib/systemd/systemd ]
+ if [ -x /mnt/lib/systemd/systemd ]
then
cp common/scripts/kvm/kvm-lava.service /mnt/etc/systemd/system/kvm-lava.service
chroot /mnt systemctl enable kvm-lava.service
@@ -191,6 +191,7 @@ echo 0 2000000 > /proc/sys/net/ipv4/ping_group_range
tamper_guest kvm-armhf.qcow2 armv7l
if ! grep -q root=/dev/nfs /proc/cmdline
+then
echo "setting up and testing networking bridge for guest"
brctl addbr br0
tunctl -u root
@@ -236,6 +237,7 @@ case ${ARCH} in
echo "64bit guest test"
$bind qemu-system-aarch64 -smp 2 -m 1024 -cpu host -M virt \
-bios QEMU_EFI.fd \
+ -device virtio-blk-device,drive=image \
-drive if=none,id=image,file=kvm-arm64.qcow2 \
$netparams \
-nographic -enable-kvm 2>&1|tee kvm-arm64.log
@@ -243,6 +245,7 @@ case ${ARCH} in
$bind qemu-system-aarch64 -smp 2 -m 1024 -cpu host,aarch64=off -M virt \
-kernel ./zImage-vexpress \
-append 'root=/dev/vda2 rw rootwait mem=1024M console=ttyAMA0,38400n8' \
+ -device virtio-blk-device,drive=image \
-drive if=none,id=image,file=kvm-armhf.qcow2 \
$netparams \
-nographic -enable-kvm 2>&1|tee kvm-arm32.log