From 71dba27cabb4fb24972d8f8b7d98a7ea45758de1 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 26 Jan 2018 11:22:26 -0700 Subject: [PATCH] test/vhost: use qemu-img from qemu install dir The test system may not have qemu-img installed system-wide, since we build a custom version of qemu and install it in a non-standard path. Change-Id: I52e16fc7bbf90b9c3d0832f6a81c5cfecd5f24ed Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/396675 Tested-by: SPDK Automated Test System Reviewed-by: Chen Wang Reviewed-by: Dariusz Stojaczyk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/vhost/integrity/integrity_start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 2c29f51ed..2ea762352 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -54,6 +54,10 @@ if [[ ! -x $VM_QEMU ]]; then echo "ERROR: QEMU binary not present in $VM_QEMU" fi +if [[ -z $QEMU_IMG ]]; then + QEMU_IMG="$qemu_install_dir/bin/qemu-img" +fi + echo "Running test with filesystem: $VM_FS" function cleanup_virsh() { @@ -90,7 +94,7 @@ function cleanup_lvol() { timing_enter integrity_test # Backing image for VM -qemu-img create -f qcow2 -o backing_file=$VM_IMG $VM_BAK_IMG +"$QEMU_IMG" create -f qcow2 -o backing_file=$VM_IMG $VM_BAK_IMG # Prepare vhost config cp $basedir/vhost.conf.in $basedir/vhost.conf