mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
tests: Remove building of virtiofsd from the test scripts
It is now provided by the container. Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
@@ -9,22 +9,6 @@ source "$(dirname "$0")"/common-aarch64.sh
|
|||||||
|
|
||||||
WORKLOADS_LOCK="$WORKLOADS_DIR/integration_test.lock"
|
WORKLOADS_LOCK="$WORKLOADS_DIR/integration_test.lock"
|
||||||
|
|
||||||
build_virtiofsd() {
|
|
||||||
VIRTIOFSD_DIR="$WORKLOADS_DIR/virtiofsd_build"
|
|
||||||
VIRTIOFSD_REPO="https://gitlab.com/virtio-fs/virtiofsd.git"
|
|
||||||
|
|
||||||
checkout_repo "$VIRTIOFSD_DIR" "$VIRTIOFSD_REPO" main "0f5865629dc995a3e9d5a73b4eb45bb91740bccb"
|
|
||||||
|
|
||||||
if [ ! -f "$VIRTIOFSD_DIR/.built" ]; then
|
|
||||||
pushd "$VIRTIOFSD_DIR" || exit
|
|
||||||
rm -rf target/
|
|
||||||
time RUSTFLAGS="" TARGET_CC="" cargo build --release
|
|
||||||
cp target/release/virtiofsd "$WORKLOADS_DIR/" || exit 1
|
|
||||||
touch .built
|
|
||||||
popd || exit
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
update_workloads() {
|
update_workloads() {
|
||||||
cp scripts/sha1sums-aarch64-common "$WORKLOADS_DIR"
|
cp scripts/sha1sums-aarch64-common "$WORKLOADS_DIR"
|
||||||
|
|
||||||
@@ -162,8 +146,9 @@ update_workloads() {
|
|||||||
# Prepare linux image (build from source or download pre-built)
|
# Prepare linux image (build from source or download pre-built)
|
||||||
prepare_linux
|
prepare_linux
|
||||||
|
|
||||||
# Build virtiofsd
|
if [ ! -f "$WORKLOADS_DIR/virtiofsd" ]; then
|
||||||
build_virtiofsd
|
cp /usr/local/bin/virtiofsd "$WORKLOADS_DIR/virtiofsd"
|
||||||
|
fi
|
||||||
|
|
||||||
BLK_IMAGE="$WORKLOADS_DIR/blk.img"
|
BLK_IMAGE="$WORKLOADS_DIR/blk.img"
|
||||||
MNT_DIR="mount_image"
|
MNT_DIR="mount_image"
|
||||||
|
|||||||
@@ -151,17 +151,8 @@ if [ ! -f "$VMLINUX_IMAGE" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
|
VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
|
||||||
VIRTIOFSD_DIR="virtiofsd_build"
|
|
||||||
if [ ! -f "$VIRTIOFSD" ]; then
|
if [ ! -f "$VIRTIOFSD" ]; then
|
||||||
pushd "$WORKLOADS_DIR" || exit
|
cp /usr/local/bin/virtiofsd "$VIRTIOFSD"
|
||||||
git clone "https://gitlab.com/virtio-fs/virtiofsd.git" $VIRTIOFSD_DIR
|
|
||||||
pushd $VIRTIOFSD_DIR || exit
|
|
||||||
git checkout 0f5865629dc995a3e9d5a73b4eb45bb91740bccb
|
|
||||||
time cargo build --release
|
|
||||||
cp target/release/virtiofsd "$VIRTIOFSD" || exit 1
|
|
||||||
popd || exit
|
|
||||||
rm -rf $VIRTIOFSD_DIR
|
|
||||||
popd || exit
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BLK_IMAGE="$WORKLOADS_DIR/blk.img"
|
BLK_IMAGE="$WORKLOADS_DIR/blk.img"
|
||||||
|
|||||||
Reference in New Issue
Block a user