diff options
author | Andrew Yourtchenko <ayourtch@gmail.com> | 2023-09-26 16:01:21 +0200 |
---|---|---|
committer | Damjan Marion <dmarion@0xa5.net> | 2023-10-03 13:23:25 +0000 |
commit | bc37878ecbad0a3a24801f1ad5af04a209b4c201 (patch) | |
tree | ad53a00aa4a6fd49f94a10483839f4fff0a0f2d4 /test/Makefile | |
parent | 08057947f3da441d571420d4594ce1e3888516ea (diff) |
build: add ability to disable some plugins from packaging and tests
When custom-packaging the VPP artifacts, it can be useful to exclude
some of the core plugins from packaging/testing, for some reasons.
A removal of a plugin(s) from the worktree needs to be tracked as
a separate change, and thus is tricky from the maintenance
point of view.
This change adds the ability to "pretend they do not exist" -
plugins which are added to the comma-separated environment
variable "VPP_EXCLUDED_PLUGINS" will not be added to the build
process and not packaged.
The tests do not have the 1:1 relationship as plugins,
so they might need to be modified separately. This change
includes some of these modifications as an example.
Type: feature
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Change-Id: Id31562d00a01ced1acbb4996a633517cbd6f09d8
Diffstat (limited to 'test/Makefile')
-rw-r--r-- | test/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile index 939b0e14813..4ff0c152a30 100644 --- a/test/Makefile +++ b/test/Makefile @@ -254,9 +254,17 @@ ifneq ($(EXTERN_APIDIR),) ARG17=--extern-apidir=$(EXTERN_APIDIR) endif +EXC_PLUGINS_ARG= +ifneq ($(VPP_EXCLUDED_PLUGINS),) +# convert the comma-separated list into N invocations of the argument to exclude a plugin +EXC_PLUGINS_ARG=$(shell echo "${VPP_EXCLUDED_PLUGINS}" | sed 's/\([^,]*\)/--excluded-plugin=\1/g; s/,/ /g') +endif + + + EXTRA_ARGS=$(ARG0) $(ARG1) $(ARG2) $(ARG3) $(ARG4) $(ARG5) $(ARG6) $(ARG7) $(ARG8) $(ARG9) $(ARG10) $(ARG11) $(ARG12) $(ARG13) $(ARG14) $(ARG15) $(ARG16) $(ARG17) -RUN_TESTS_ARGS=--failed-dir=$(FAILED_DIR) --verbose=$(V) --jobs=$(TEST_JOBS) --filter=$(TEST) --retries=$(RETRIES) --venv-dir=$(VENV_PATH) --vpp-ws-dir=$(WS_ROOT) --vpp-tag=$(TAG) --rnd-seed=$(RND_SEED) --vpp-worker-count="$(VPP_WORKER_COUNT)" --keep-pcaps $(PLUGIN_PATH_ARGS) $(TEST_PLUGIN_PATH_ARGS) $(EXTRA_ARGS) +RUN_TESTS_ARGS=--failed-dir=$(FAILED_DIR) --verbose=$(V) --jobs=$(TEST_JOBS) --filter=$(TEST) --retries=$(RETRIES) --venv-dir=$(VENV_PATH) --vpp-ws-dir=$(WS_ROOT) --vpp-tag=$(TAG) --rnd-seed=$(RND_SEED) --vpp-worker-count="$(VPP_WORKER_COUNT)" --keep-pcaps $(PLUGIN_PATH_ARGS) $(EXC_PLUGINS_ARG) $(TEST_PLUGIN_PATH_ARGS) $(EXTRA_ARGS) RUN_SCRIPT_ARGS=--python-opts=$(PYTHON_OPTS) define retest-func |