From d6c08d902b5aff4486cc12df8285fe6311c1a3aa Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Fri, 17 Sep 2021 08:58:13 -0700 Subject: [PATCH] ci: Use the pre-installed virtiofsd Signed-off-by: Bo Chen --- scripts/run_integration_tests_aarch64.sh | 15 --------------- scripts/run_integration_tests_x86_64.sh | 14 -------------- tests/integration.rs | 9 +-------- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 821e21b85..7cf5e468e 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -192,21 +192,6 @@ update_workloads() { cp $SRCDIR/resources/linux-config-aarch64 $LINUX_CUSTOM_DIR/.config build_custom_linux_kernel - VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" - QEMU_DIR="qemu_build" - - if [ ! -f "$VIRTIOFSD" ]; then - pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR - pushd $QEMU_DIR - time ./configure --prefix=$PWD --target-list=aarch64-softmmu - time make virtiofsd -j `nproc` - cp virtiofsd $VIRTIOFSD || exit 1 - popd - rm -rf $QEMU_DIR - popd - fi - VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd-rs" VIRTIOFSD_RS_DIR="virtiofsd_rs_build" if [ ! -f "$VIRTIOFSD_RS" ]; then diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index c814dc5da..9711fa1ff 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -118,20 +118,6 @@ if [ -d "$LINUX_CUSTOM_DIR" ]; then rm -rf $LINUX_CUSTOM_DIR fi -VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" -QEMU_DIR="qemu_build" -if [ ! -f "$VIRTIOFSD" ]; then - pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR - pushd $QEMU_DIR - time ./configure --prefix=$PWD --target-list=x86_64-softmmu - time make virtiofsd -j `nproc` - cp virtiofsd $VIRTIOFSD || exit 1 - popd - rm -rf $QEMU_DIR - popd -fi - VIRTIOFSD_RS="$WORKLOADS_DIR/virtiofsd-rs" VIRTIOFSD_RS_DIR="virtiofsd_rs_build" if [ ! -f "$VIRTIOFSD_RS" ]; then diff --git a/tests/integration.rs b/tests/integration.rs index 937d50880..7313c06d7 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -104,18 +104,11 @@ mod tests { shared_dir: &str, cache: &str, ) -> (std::process::Child, String) { - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut virtiofsd_path = workload_path; - virtiofsd_path.push("virtiofsd"); - let virtiofsd_path = String::from(virtiofsd_path.to_str().unwrap()); - let virtiofsd_socket_path = String::from(tmp_dir.as_path().join("virtiofs.sock").to_str().unwrap()); // Start the daemon - let child = Command::new(virtiofsd_path.as_str()) + let child = Command::new("virtiofsd") .args(&[format!("--socket-path={}", virtiofsd_socket_path).as_str()]) .args(&["-o", format!("source={}", shared_dir).as_str()]) .args(&["-o", format!("cache={}", cache).as_str()])