Version of patch that uses sh script to parse MAKEFLAGS and set
--nrunner-max-parallel-tasks accordingly. As already mentioned, works with Make
4.2 or newer, otherwise only single thread or all cores can be used.
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9422ddaece..ee059dc135 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -93,6 +93,9 @@ TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
TESTS_PYTHON=$(TESTS_VENV_DIR)/bin/python3
+# 1 task is used by default
+NRUNNER_MAX_TASKS=--nrunner-max-parallel-tasks 1
+
ifndef AVOCADO_TESTS
AVOCADO_TESTS=tests/avocado
endif
@@ -111,6 +114,21 @@ quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
$(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \
"VENVPIP","$1")
+get_avocado_max_tasks:
+# make 4.2 and later provide number of jobs in MAKEFLAGS
+# in earlier versions only -j can be used
+# Use N jobs if -jN isprovided. Use $(nproc) jobs if only -j is provided,
+# Use 1 job if no -j is found in MAKEFLAGS string.
+ $(eval MAKE_JOBS=$(shell (if (echo $(MAKEFLAGS) | grep -Eq
^.*-j\([0-9]+\).*$$); then \
+ (echo $(MAKEFLAGS) | sed -r 's/.*-j([0-9]+).*/\1/'); \
+ elif (echo $(MAKEFLAGS) | grep -Eq ^.*-j.*$$); then \
+ nproc; \
+ else \
+ echo 1; \
+ fi)))
+
+ $(eval NRUNNER_MAX_TASKS=--nrunner-max-parallel-tasks $$(MAKE_JOBS))
+
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
$(call quiet-command, $(PYTHON) -m venv $@, VENV, $@)
$(call quiet-venv-pip,install -e "$(SRC_PATH)/python/")
@@ -138,14 +156,14 @@ get-vm-image-fedora-31-%: check-venv
# download all vm images, according to defined targets
get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%,
$(FEDORA_31_DOWNLOAD))
-check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
+check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
get_avocado_max_tasks
$(call quiet-command, \
$(TESTS_PYTHON) -m avocado \
--show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
$(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \
--filter-by-tags-include-empty-key) \
$(AVOCADO_CMDLINE_TAGS) \
- $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
+ $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS)
$(NRUNNER_MAX_TASKS), \
"AVOCADO", "tests/avocado")
check-acceptance-deprecated-warning:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0ba561b6bd..3b8c4d4706 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,5 +2,5 @@
# in the tests/venv Python virtual environment. For more info,
# refer to: https://pip.pypa.io/en/stable/user_guide/#id1
# Note that qemu.git/python/ is always implicitly installed.
-avocado-framework==88.1
+avocado-framework<93
pycdlib==1.11.0
November 16, 2022 6:42 PM, "Daniel P. Berrangé" <berra...@redhat.com> wrote:
> On Wed, Nov 16, 2022 at 02:37:43PM +0000, bakul...@ispras.ru wrote:
>
>> Valid point, thank you.
>>
>> I can see three options what to do:
>> e1) Ignore older version of make and assume that 4.2 or newer is used
>> (4.1 is in Ubuntu 18.04 that is no longer supported as a build platform
>> as I was told; 20.04 has 4.2). In this case make provides number of
>> jobs in $MAKEFLAGS and this makes getting it trivial. In case of an
>> older make only two options will be available: (default) single-threaded,
>> and using all cores.
>>
>> Which one should I choose?
>
> Ignore older make. Ubuntu 18.04 is not a platform we target anymore,
> so we shouldn't be writing compat code for handling it, and in any
> case degrading to single threaded or all-cores is fine fallback IMHO.
>
> With regards,
> Daniel
> --
> |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org -o- https://fstop138.berrange.com :|
> |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
