From b2bf88bcb187316d6244728821633cb73a05cd1f Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 21 Feb 2022 09:55:43 +0000 Subject: [PATCH] tests, scripts: Rename virtiofsd binary Signed-off-by: Rob Bradford --- scripts/run_integration_tests_aarch64.sh | 2 +- scripts/run_integration_tests_x86_64.sh | 2 +- tests/integration.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 7e103f132..4d046f618 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -217,7 +217,7 @@ update_workloads() { guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" # Build virtiofsd - VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd-rs" + VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd" VIRTIOFSD_RS_DIR="virtiofsd_rs_build" if [ ! -f "$VIRTIOFSD_RS" ]; then pushd $WORKLOADS_DIR diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index fbde47efd..4e6bbae2f 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -129,7 +129,7 @@ if [ -d "$LINUX_CUSTOM_DIR" ]; then rm -rf $LINUX_CUSTOM_DIR fi -VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd-rs" +VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd" VIRTIOFSD_RS_DIR="virtiofsd_rs_build" if [ ! -f "$VIRTIOFSD_RS" ]; then pushd $WORKLOADS_DIR diff --git a/tests/integration.rs b/tests/integration.rs index 42ad1b203..a59d1b9ca 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -81,7 +81,7 @@ fn prepare_virtiofsd( workload_path.push("workloads"); let mut virtiofsd_path = workload_path; - virtiofsd_path.push("virtiofsd-rs"); + virtiofsd_path.push("virtiofsd"); let virtiofsd_path = String::from(virtiofsd_path.to_str().unwrap()); let virtiofsd_socket_path =