From 81fd66a31e44a07ee98f22946104f951245123e5 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 2 Oct 2025 15:04:36 +1000 Subject: test: Don't delete exetool on make clean exetool is listed in $(LOCAL_ASSETS), which seems like it makes sense, until you realise that $(LOCAL_ASSETS) are deleted on make clean, and we can't rebuild exetool after deleting it (since it's just part of the exeter tree we download). Move it to $(DOWNLOAD_ASSETS) instead. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- test/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/Makefile b/test/Makefile index 4938827..3800a0a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -52,15 +52,14 @@ UBUNTU_NEW_IMGS = xenial-server-cloudimg-powerpc-disk1.img \ jammy-server-cloudimg-s390x.img UBUNTU_IMGS = $(UBUNTU_OLD_IMGS) $(UBUNTU_NEW_IMGS) -DOWNLOAD_ASSETS = exeter mbuto podman \ +DOWNLOAD_ASSETS = $(EXETOOL) mbuto podman \ $(DEBIAN_IMGS) $(FEDORA_IMGS) $(OPENSUSE_IMGS) $(UBUNTU_IMGS) TESTDATA_ASSETS = small.bin big.bin medium.bin \ rampstream LOCAL_ASSETS = mbuto.img mbuto.mem.img podman/bin/podman QEMU_EFI.fd \ $(DEBIAN_IMGS:%=prepared-%) $(FEDORA_IMGS:%=prepared-%) \ $(UBUNTU_NEW_IMGS:%=prepared-%) \ - nstool guest-key guest-key.pub $(EXETOOL) \ - $(TESTDATA_ASSETS) + nstool guest-key guest-key.pub $(TESTDATA_ASSETS) ASSETS = $(DOWNLOAD_ASSETS) $(LOCAL_ASSETS) -- cgit v1.2.3