[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 01/10] tests/vm: Add validation of target
From: |
Alex Bennée |
Subject: |
Re: [PATCH v3 01/10] tests/vm: Add validation of target |
Date: |
Wed, 11 Mar 2020 10:57:36 +0000 |
User-agent: |
mu4e 1.3.9; emacs 28.0.50 |
Robert Foley <address@hidden> writes:
> This validation is now useful since some targets
> may not be valid if their dependencies are not installed.
> Instead of allowing the scripts to fail with missing dependencies
> we will fail earlier with a helpful error message.
>
> Signed-off-by: Robert Foley <address@hidden>
> ---
> tests/vm/Makefile.include | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> index 1bf9693d19..835e3f3549 100644
> --- a/tests/vm/Makefile.include
> +++ b/tests/vm/Makefile.include
> @@ -2,7 +2,7 @@
>
> .PHONY: vm-build-all vm-clean-all
>
> -IMAGES := freebsd netbsd openbsd centos fedora
> +IMAGES := freebsd netbsd openbsd fedora
> ifneq ($(GENISOIMAGE),)
> IMAGES += ubuntu.i386 centos
> endif
> @@ -49,9 +49,20 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES))
> vm-clean-all:
> rm -f $(IMAGE_FILES)
>
> +# Validate the target since some targets will not
> +# be valid if their software dependencies are not installed.
> +define validate_target
> + @echo $(1) | grep $(2) || \
> + (echo "Invalid target ($(2))"; \
> + echo "Valid Targets are: $(1)"; \
> + echo "See make vm-help for more information."; \
> + exit 1;)
> +endef
> +
> $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
> $(SRC_PATH)/tests/vm/basevm.py \
> $(SRC_PATH)/tests/vm/Makefile.include
> + $(call validate_target,${IMAGES},$*)
This mechanism seems suspect to me. Surely the "make" way is to just
ensure we don't include the targets when we don't have the dependencies
like we do above for GENISOIMAGE?
Random side note: I wonder how this sort of problem is solved in a meson
world? Paolo?
--
Alex Bennée
- [PATCH v3 00/10] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/03/10
- [PATCH v3 01/10] tests/vm: Add validation of target, Robert Foley, 2020/03/10
- Re: [PATCH v3 01/10] tests/vm: Add validation of target,
Alex Bennée <=
- [PATCH v3 02/10] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/03/10
- [PATCH v3 04/10] tests/vm: add --boot-console switch, Robert Foley, 2020/03/10
- [PATCH v3 03/10] tests/vm: Added configuration file support, Robert Foley, 2020/03/10
- [PATCH v3 05/10] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/03/10
- [PATCH v3 06/10] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/03/10
- [PATCH v3 07/10] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/03/10
- [PATCH v3 08/10] tests/vm: Added a new script for centos.aarch64., Robert Foley, 2020/03/10
- [PATCH v3 09/10] tests/vm: change scripts to use self._config, Robert Foley, 2020/03/10
- [PATCH v3 10/10] tests/vm: Add workaround to consume console, Robert Foley, 2020/03/10
- Re: [PATCH v3 00/10] tests/vm: Add support for aarch64 VMs, no-reply, 2020/03/10