mirror of
https://github.com/xemu-project/xemu.git
synced 2025-02-21 21:12:31 +00:00
Acceptance tests: add make rule for running them
The acceptance (aka functional, aka Avocado-based) tests are Python files located in "tests/acceptance" that need to be run with the Avocado libs and test runner. Let's provide a convenient way for QEMU developers to run them, by making use of the tests-venv with the required setup. Also, while the Avocado test runner will take care of creating a location to save test results to, it was understood that it's better if the results are kept within the build tree. Signed-off-by: Cleber Rosa <crosa@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Caio Carrara <ccarrara@redhat.com> Message-Id: <20181018153134.8493-3-crosa@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
213137217a
commit
a56931eef3
@ -545,10 +545,39 @@ Tests based on ``avocado_qemu.Test`` can easily:
|
|||||||
- http://avocado-framework.readthedocs.io/en/latest/api/test/avocado.html#avocado.Test
|
- http://avocado-framework.readthedocs.io/en/latest/api/test/avocado.html#avocado.Test
|
||||||
- http://avocado-framework.readthedocs.io/en/latest/api/utils/avocado.utils.html
|
- http://avocado-framework.readthedocs.io/en/latest/api/utils/avocado.utils.html
|
||||||
|
|
||||||
Installation
|
Running tests
|
||||||
------------
|
-------------
|
||||||
|
|
||||||
To install Avocado and its dependencies, run:
|
You can run the acceptance tests simply by executing:
|
||||||
|
|
||||||
|
.. code::
|
||||||
|
|
||||||
|
make check-acceptance
|
||||||
|
|
||||||
|
This involves the automatic creation of Python virtual environment
|
||||||
|
within the build tree (at ``tests/venv``) which will have all the
|
||||||
|
right dependencies, and will save tests results also within the
|
||||||
|
build tree (at ``tests/results``).
|
||||||
|
|
||||||
|
Note: the build environment must be using a Python 3 stack, and have
|
||||||
|
the ``venv`` and ``pip`` packages installed. If necessary, make sure
|
||||||
|
``configure`` is called with ``--python=`` and that those modules are
|
||||||
|
available. On Debian and Ubuntu based systems, depending on the
|
||||||
|
specific version, they may be on packages named ``python3-venv`` and
|
||||||
|
``python3-pip``.
|
||||||
|
|
||||||
|
The scripts installed inside the virtual environment may be used
|
||||||
|
without an "activation". For instance, the Avocado test runner
|
||||||
|
may be invoked by running:
|
||||||
|
|
||||||
|
.. code::
|
||||||
|
|
||||||
|
tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/acceptance/
|
||||||
|
|
||||||
|
Manual Installation
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
To manually install Avocado and its dependencies, run:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
@ -689,11 +718,15 @@ The exact QEMU binary to be used on QEMUMachine.
|
|||||||
Uninstalling Avocado
|
Uninstalling Avocado
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
If you've followed the installation instructions above, you can easily
|
If you've followed the manual installation instructions above, you can
|
||||||
uninstall Avocado. Start by listing the packages you have installed::
|
easily uninstall Avocado. Start by listing the packages you have
|
||||||
|
installed::
|
||||||
|
|
||||||
pip list --user
|
pip list --user
|
||||||
|
|
||||||
And remove any package you want with::
|
And remove any package you want with::
|
||||||
|
|
||||||
pip uninstall <package_name>
|
pip uninstall <package_name>
|
||||||
|
|
||||||
|
If you've used ``make check-acceptance``, the Python virtual environment where
|
||||||
|
Avocado is installed will be cleaned up as part of ``make check-clean``.
|
||||||
|
@ -11,6 +11,7 @@ check-help:
|
|||||||
@echo " $(MAKE) check-qapi-schema Run QAPI schema tests"
|
@echo " $(MAKE) check-qapi-schema Run QAPI schema tests"
|
||||||
@echo " $(MAKE) check-block Run block tests"
|
@echo " $(MAKE) check-block Run block tests"
|
||||||
@echo " $(MAKE) check-tcg Run TCG tests"
|
@echo " $(MAKE) check-tcg Run TCG tests"
|
||||||
|
@echo " $(MAKE) check-acceptance Run all acceptance (functional) tests"
|
||||||
@echo " $(MAKE) check-report.html Generates an HTML test report"
|
@echo " $(MAKE) check-report.html Generates an HTML test report"
|
||||||
@echo " $(MAKE) check-venv Creates a Python venv for tests"
|
@echo " $(MAKE) check-venv Creates a Python venv for tests"
|
||||||
@echo " $(MAKE) check-clean Clean the tests"
|
@echo " $(MAKE) check-clean Clean the tests"
|
||||||
@ -902,10 +903,15 @@ check-decodetree:
|
|||||||
|
|
||||||
# Python venv for running tests
|
# Python venv for running tests
|
||||||
|
|
||||||
.PHONY: check-venv
|
.PHONY: check-venv check-acceptance
|
||||||
|
|
||||||
TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
|
TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
|
||||||
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
|
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
|
||||||
|
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
|
||||||
|
# Controls the output generated by Avocado when running tests.
|
||||||
|
# Any number of command separated loggers are accepted. For more
|
||||||
|
# information please refer to "avocado --help".
|
||||||
|
AVOCADO_SHOW=none
|
||||||
|
|
||||||
$(shell $(PYTHON) -c 'import sys; assert sys.version_info >= (3,0)' >/dev/null 2>&1)
|
$(shell $(PYTHON) -c 'import sys; assert sys.version_info >= (3,0)' >/dev/null 2>&1)
|
||||||
ifeq ($(.SHELLSTATUS),0)
|
ifeq ($(.SHELLSTATUS),0)
|
||||||
@ -922,8 +928,19 @@ $(TESTS_VENV_DIR):
|
|||||||
$(error "venv directory for tests requires Python 3")
|
$(error "venv directory for tests requires Python 3")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$(TESTS_RESULTS_DIR):
|
||||||
|
$(call quiet-command, mkdir -p $@, \
|
||||||
|
MKDIR, $@)
|
||||||
|
|
||||||
check-venv: $(TESTS_VENV_DIR)
|
check-venv: $(TESTS_VENV_DIR)
|
||||||
|
|
||||||
|
check-acceptance: check-venv $(TESTS_RESULTS_DIR)
|
||||||
|
$(call quiet-command, \
|
||||||
|
$(TESTS_VENV_DIR)/bin/python -m avocado \
|
||||||
|
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
|
||||||
|
--failfast=on $(SRC_PATH)/tests/acceptance, \
|
||||||
|
"AVOCADO", "tests/acceptance")
|
||||||
|
|
||||||
# Consolidated targets
|
# Consolidated targets
|
||||||
|
|
||||||
.PHONY: check-qapi-schema check-qtest check-unit check check-clean
|
.PHONY: check-qapi-schema check-qtest check-unit check check-clean
|
||||||
@ -937,7 +954,7 @@ check-clean:
|
|||||||
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
|
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
|
||||||
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
|
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
|
||||||
rm -f tests/test-qapi-gen-timestamp
|
rm -f tests/test-qapi-gen-timestamp
|
||||||
rm -rf $(TESTS_VENV_DIR)
|
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
|
||||||
|
|
||||||
clean: check-clean
|
clean: check-clean
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
# Add Python module requirements, one per line, to be installed
|
# Add Python module requirements, one per line, to be installed
|
||||||
# in the tests/venv Python virtual environment. For more info,
|
# in the tests/venv Python virtual environment. For more info,
|
||||||
# refer to: https://pip.pypa.io/en/stable/user_guide/#id1
|
# refer to: https://pip.pypa.io/en/stable/user_guide/#id1
|
||||||
|
avocado-framework==65.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user