[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] tests/acceptance: introduce new check-avocado target
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 1/9] tests/acceptance: introduce new check-avocado target |
Date: |
Mon, 8 Nov 2021 17:17:31 +0100 |
From: Willian Rampazzo <willianr@redhat.com>
This introduces a new `make` target, `check-avocado`, and adds a
deprecation message about the `check-acceptance` target. This is
a preparation for renaming the `tests/acceptance` folder to
`tests/avocado`.
The plan is to remove the call to the `check-avocado` target one
or two months after the release and leave the warning to force
people to move to the new `check-avocado` target.
Later, the `check-acceptance` target can be removed. The intent
is to avoid a direct impact during the current soft freeze.
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20211105155354.154864-2-willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/Makefile.include | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8434a33fe68..8e8ee584933 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -16,7 +16,7 @@ ifneq ($(filter $(all-check-targets), check-softfloat),)
@echo " $(MAKE) check-tcg Run TCG tests"
@echo " $(MAKE) check-softfloat Run FPU emulation tests"
endif
- @echo " $(MAKE) check-acceptance Run acceptance (functional) tests
for currently configured targets"
+ @echo " $(MAKE) check-avocado Run avocado (integration) tests
for currently configured targets"
@echo
@echo " $(MAKE) check-report.tap Generates an aggregated TAP test
report"
@echo " $(MAKE) check-venv Creates a Python venv for tests"
@@ -24,7 +24,7 @@ endif
@echo
@echo "The following are useful for CI builds"
@echo " $(MAKE) check-build Build most test binaris"
- @echo " $(MAKE) get-vm-images Downloads all images used by
acceptance tests, according to configured targets (~350 MB each, 1.5 GB max)"
+ @echo " $(MAKE) get-vm-images Downloads all images used by
avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
@echo
@echo
@echo "The variable SPEED can be set to control the gtester speed
setting."
@@ -83,7 +83,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
# Python venv for running tests
-.PHONY: check-venv check-acceptance
+.PHONY: check-venv check-avocado check-acceptance
check-acceptance-deprecated-warning
TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
@@ -127,12 +127,12 @@ get-vm-image-fedora-31-%: check-venv
$(call quiet-command, \
$(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \
--distro=fedora --distro-version=31 --arch=$*, \
- "AVOCADO", "Downloading acceptance tests VM image for $*")
+ "AVOCADO", "Downloading avocado tests VM image for $*")
# download all vm images, according to defined targets
get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%,
$(FEDORA_31_DOWNLOAD))
-check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
+check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
$(call quiet-command, \
$(TESTS_VENV_DIR)/bin/python -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
@@ -142,6 +142,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
get-vm-images
$(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
"AVOCADO", "tests/acceptance")
+check-acceptance-deprecated-warning:
+ @echo
+ @echo "Note '$(MAKE) check-acceptance' is deprecated, use '$(MAKE)
check-avocado' instead."
+ @echo
+
+check-acceptance: check-acceptance-deprecated-warning | check-avocado
+
# Consolidated targets
.PHONY: check-block check check-clean get-vm-images
--
2.31.1
- [PULL 0/9] Integration testing patches for 2021-11-08, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 1/9] tests/acceptance: introduce new check-avocado target,
Philippe Mathieu-Daudé <=
- [PULL 3/9] tests/avocado: Extract QemuBaseTest from Test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 2/9] tests/acceptance: rename tests acceptance to tests avocado, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 4/9] tests/avocado: Make pick_default_qemu_bin() more generic, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 6/9] tests/avocado: Share useful helpers from virtiofs_submounts test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 5/9] tests/avocado: Introduce QemuUserTest base class, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 7/9] tests/avocado: Add bFLT loader linux-user test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 8/9] tests/avocado: Rename avocado_qemu.Test -> QemuSystemTest, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 9/9] tests/avocado: Remove p7zip binary availability check, Philippe Mathieu-Daudé, 2021/11/08
- Re: [PULL 0/9] Integration testing patches for 2021-11-08, Richard Henderson, 2021/11/08