From 54a493de322b4c0a9f10f7ca2a2f698c04e4d1b2 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 7 Oct 2019 05:13:54 -0400 Subject: [PATCH] test/vhost: Fix path to integrity_vm.sh Patch b6af628 while addressing Shellcheck 2088, broke the pathing to integrity_vm.sh within VM. Originally tilde was used within quotes so it didn't expand, since cmd was executed as root the path was correct on VM. After the change the path was changed to $HOME, making it actually expand on the host system (not VM). Path was made incorrect. Since we already scp to /root/, it shouldn't be an issue to use that path in explicitly when executing. This fixes recent nightly run failures. Change-Id: I2e0ac767cbf77a71841db260e602b568b1f510a1 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/470624 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Maciej Szwed Reviewed-by: Darek Stojaczyk Reviewed-by: Seth Howell Reviewed-by: Jim Harris --- test/vhost/integrity/integrity_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index a3e929774..7efad72c6 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -88,7 +88,7 @@ vm_wait_for_boot 300 0 # Run tests on VM vm_scp 0 $testdir/integrity_vm.sh root@127.0.0.1:/root/integrity_vm.sh -vm_exec 0 "$HOME/integrity_vm.sh $ctrl_type \"$vm_fs\"" +vm_exec 0 "/root/integrity_vm.sh $ctrl_type \"$vm_fs\"" notice "Shutting down virtual machine..." vm_shutdown_all