FORCE_FOREGROUND=1
endif
-VENV_PATH=$(TEST_DIR)/venv
+VENV_BR_DIR=$(BR)/test
+VENV_PATH=$(VENV_BR_DIR)/venv
ifeq ($(TEST_DEBUG),1)
VENV_RUN_DIR:=$(VENV_PATH)/run-debug
endif
PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)')
-PIP_VERSION=22.0.3
+PIP_VERSION=22.0.4
# Keep in sync with requirements.txt
-PIP_TOOLS_VERSION=6.5.0
-PIP_SETUPTOOLS_VERSION=60.7.1
+PIP_TOOLS_VERSION=6.6.0
+PIP_SETUPTOOLS_VERSION=62.1.0
PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
-BUILD_COV_DIR=$(TEST_BR)/coverage
+BUILD_COV_DIR=$(BR)/test-coverage
PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION)-$(PIP_TOOLS_VERSION).done
PIP_INSTALL_DONE=$(VENV_RUN_DIR)/pip-install-$(PYTHON_VERSION)-$(PIP_VERSION).done
ARG16=--api-fuzz=on
endif
-EXTRA_ARGS=$(ARG0) $(ARG1) $(ARG2) $(ARG3) $(ARG4) $(ARG5) $(ARG6) $(ARG7) $(ARG8) $(ARG9) $(ARG10) $(ARG11) $(ARG12) $(ARG13) $(ARG14) $(ARG15) $(ARG16)
+ARG17=
+ifneq ($(EXTERN_APIDIR),)
+ARG17=--extern-apidir=$(EXTERN_APIDIR)
+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_SCRIPT_ARGS=--python-opts=$(PYTHON_OPTS)
@if [ $(FORCE_NO_WIPE) -eq "0" ] ; then rm -rf /tmp/vpp-unittest-*; fi
@rm -f /tmp/api_post_mortem.*
@rm -rf $(FAILED_DIR)
+ @rm -rf /tmp/vpp-vm-tests
.PHONY: wipe
wipe: reset
- @rm -rf $(VENV_PATH)
+ @rm -rf $(VENV_BR_DIR)
@rm -rf $(patsubst %,%/__pycache__, $(VPP_TEST_DIRS))
$(BUILD_COV_DIR):
@mkdir -p $@
-.PHONY: cov
-cov: wipe-cov test-dep ext $(BUILD_COV_DIR)
+.PHONY: cov-prep
+cov-prep: test-dep
@lcov --zerocounters --directory $(VPP_BUILD_DIR)
@test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR)
- $(call retest-func)
- @lcov --capture --directory $(VPP_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
- @test -z "$(EXTERN_COV_DIR)" || lcov --capture --directory $(EXTERN_COV_DIR) --output-file $(BUILD_COV_DIR)/extern-coverage.info
- @genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
- @test -z "$(EXTERN_COV_DIR)" || genhtml $(BUILD_COV_DIR)/extern-coverage.info --output-directory $(BUILD_COV_DIR)/extern-html
+
+.PHONY: cov-post
+cov-post: wipe-cov $(BUILD_COV_DIR)
+ @lcov --capture \
+ --directory $(VPP_BUILD_DIR) \
+ --output-file $(BUILD_COV_DIR)/coverage.info
+ @test -z "$(EXTERN_COV_DIR)" || \
+ lcov --capture \
+ --directory $(EXTERN_COV_DIR) \
+ --output-file $(BUILD_COV_DIR)/extern-coverage.info
+ @lcov --remove $(BUILD_COV_DIR)/coverage.info \
+ "/usr/include/*" "*/build-root/*" "/opt/*" "/usr/lib/*" \
+ -o $(BUILD_COV_DIR)/coverage-filtered.info
+ @genhtml $(BUILD_COV_DIR)/coverage-filtered.info \
+ --output-directory $(BUILD_COV_DIR)/html
+ @test -z "$(EXTERN_COV_DIR)" || \
+ genhtml $(BUILD_COV_DIR)/extern-coverage.info \
+ --output-directory $(BUILD_COV_DIR)/extern-html
@echo
@echo "Build finished. Code coverage report is in $(BUILD_COV_DIR)/html/index.html"
@test -z "$(EXTERN_COV_DIR)" || echo "Code coverage report for out-of-tree objects is in $(BUILD_COV_DIR)/extern-html/index.html"
+.PHONY: cov
+cov:
+ make -C . cov-prep test cov-post
+
.PHONY: wipe-cov
wipe-cov: wipe
@rm -rf $(BUILD_COV_DIR)
wipe-all: wipe wipe-papi wipe-cov
@rm -rf $(TEST_BR)
-.PHONY: checkstyle-diff
-checkstyle-diff: $(PIP_INSTALL_DONE)
- @bash -c "source $(VENV_PATH)/bin/activate &&\
- python3 -m pip install pycodestyle"
- @bash -c "source $(VENV_PATH)/bin/activate &&\
- cd $(WS_ROOT) && git diff --name-only --no-color --relative HEAD~1 ':!*.patch' | grep '.py$$' | xargs -I XXX \
- pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 -v XXX ||\
- (echo \"*********************************************************************\" &&\
- echo \"* Test framework PEP8 compliance check FAILED (checked changed files)\" &&\
- echo \"*********************************************************************\" &&\
- false)"
- @echo "*********************************************************************"
- @echo "* Test framework PEP8 compliance check passed (checked changed files)"
- @echo "*********************************************************************"
-
.PHONY: start-gdb
start-gdb: sanity
@bash -c "source $(VENV_PATH)/bin/activate && python3 -c 'from debug import start_vpp_in_gdb; start_vpp_in_gdb()' $(RUN_TESTS_ARGS)"
-.PHONY: checkstyle
-checkstyle: $(PIP_INSTALL_DONE)
+.PHONY: checkstyle-python-all
+checkstyle-python-all: $(PIP_INSTALL_DONE)
@bash -c "source $(VENV_PATH)/bin/activate &&\
- python3 -m pip install pycodestyle"
+ black -t py39 --check --diff $(WS_ROOT) ||\
+ (echo \"*************************************************************************\" &&\
+ echo \"* Test framework PEP8 compliance check FAILED (maybe: make fixstyle-python)\" &&\
+ echo \"*************************************************************************\" &&\
+ false)"
+ @echo "*******************************************************************"
+ @echo "* Test framework PEP8 compliance check passed"
+ @echo "*******************************************************************"
+
+.PHONY: checkstyle
+checkstyle: checkstyle-python-all
+
+.PHONY: fixstyle-python-all
+fixstyle-python-all: $(PIP_INSTALL_DONE)
@bash -c "source $(VENV_PATH)/bin/activate &&\
- pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 -v *.py ||\
- (echo \"*******************************************************************\" &&\
- echo \"* Test framework PEP8 compliance check FAILED (checked all files)\" &&\
- echo \"*******************************************************************\" &&\
- false)"
+ black -t py39 $(WS_ROOT) ||\
+ (echo \"*************************************************************************\" &&\
+ echo \"* Test framework PEP8 compliance check FAILED (maybe: make fixstyle-python)\" &&\
+ echo \"*************************************************************************\" &&\
+ false)"
@echo "*******************************************************************"
- @echo "* Test framework PEP8 compliance check passed (checked all files)"
+ @echo "* Test framework PEP8 compliance check passed"
@echo "*******************************************************************"
.PHONY: help
@echo ""
@echo " test - build and run (basic) functional tests"
@echo " test-debug - build and run (basic) functional tests (debug build)"
+ @echo " test-cov - generate code coverage report for functional tests"
+ @echo " test-cov-prep - coverage phase #1 : prepare lcov"
+ @echo " test-cov-build - coverage phase #2 : build gcov image & run tests against it (use TEST=)"
+ @echo " test-cov-post - coverage phase #3 : generate lcov html report"
@echo " test-all - build and run functional and extended tests"
@echo " test-all-debug - build and run functional and extended tests (debug build)"
+ @echo " test-all-cov - generate code coverage report for functional and extended tests"
@echo " retest - run functional tests"
@echo " retest-debug - run functional tests (debug build)"
@echo " retest-all - run functional and extended tests"
@echo " retest-all-debug - run functional and extended tests (debug build)"
- @echo " test-cov - generate code coverage report for test framework"
- @echo " test-gcov - build and run functional tests (gcov build)"
@echo " test-wipe - wipe (temporary) files generated by unit tests"
@echo " test-wipe-cov - wipe code coverage report for test framework"
@echo " test-wipe-papi - rebuild vpp_papi sources"
@echo " test-wipe-all - wipe (temporary) files generated by unit tests, and coverage"
@echo " test-shell - enter shell with test environment"
@echo " test-shell-debug - enter shell with test environment (debug build)"
- @echo " test-checkstyle - check PEP8 compliance for test framework"
@echo " test-refresh-deps - refresh the Python dependencies for the tests"
@echo ""
- @echo "Arguments controlling test runs:"
- @echo ""
- @echo " V=[0|1|2] - set test verbosity level"
- @echo " 0=ERROR, 1=INFO, 2=DEBUG"
- @echo " TEST_JOBS=[<n>|auto] - use at most <n> parallel python processes for test execution, if auto, set to number of available cpus (default: 1)"
- @echo " MAX_VPP_CPUS=[<n>|auto]- use at most <n> cpus for running vpp main and worker threads, if auto, set to number of available cpus (default: auto)"
- @echo " CACHE_OUTPUT=[0|n|no] - disable cache VPP stdout/stderr and log as one block after test finishes (default: yes)"
- @echo " FAILFAST=[1|y|yes] - fail fast if 1, otherwise complete all tests"
- @echo " TIMEOUT=<timeout> - fail test suite if any single test takes longer than <timeout> (in seconds) to finish (default: 600)"
- @echo " RETRIES=<n> - retry failed tests <n> times"
- @echo " DEBUG=<type> - set VPP debugging kind"
- @echo " DEBUG=core - detect coredump and load it in gdb on crash"
- @echo " DEBUG=gdb - allow easy debugging by printing VPP PID"
- @echo " and waiting for user input before running"
- @echo " and tearing down a testcase"
- @echo " DEBUG=gdbserver - run gdb inside a gdb server, otherwise"
- @echo " same as above"
- @echo " DEBUG=attach - attach test case to already running vpp in gdb (see test-start-vpp-in-gdb)"
- @echo " STEP=[1|y|yes] - enable stepping through a testcase (for testcase debugging)"
- @echo " SANITY=[0|n|no] - disable sanity import of vpp-api/sanity vpp run before running tests"
- @echo " EXTENDED_TESTS=[1|y|yes] - run extended tests"
- @echo " TEST=<filter> - filter the set of tests:"
- @echo " by file-name - only run tests from specified file, e.g. TEST=test_bfd selects all tests from test_bfd.py"
- @echo " by file-suffix - same as file-name, but 'test_' is omitted e.g. TEST=bfd selects all tests from test_bfd.py"
- @echo " by wildcard - wildcard filter is <file>.<class>.<test function>, each can be replaced by '*'"
- @echo " e.g. TEST='test_bfd.*.*' is equivalent to above example of filter by file-name"
- @echo " TEST='bfd.*.*' is equivalent to above example of filter by file-suffix"
- @echo " TEST='bfd.BFDAPITestCase.*' selects all tests from test_bfd.py which are part of BFDAPITestCase class"
- @echo " TEST='bfd.BFDAPITestCase.test_add_bfd' selects a single test named test_add_bfd from test_bfd.py/BFDAPITestCase"
- @echo " TEST='*.*.test_add_bfd' selects all test functions named test_add_bfd from all files/classes"
- @echo " VARIANT=<variant> - specify which march node variant to unit test"
- @echo " e.g. VARIANT=skx test the skx march variants"
- @echo " e.g. VARIANT=icl test the icl march variants"
- @echo " COREDUMP_SIZE=<size> - pass <size> as unix { coredump-size <size> } argument to vpp"
- @echo " e.g. COREDUMP_SIZE=4g"
- @echo " COREDUMP_SIZE=unlimited"
- @echo " COREDUMP_COMPRESS=[1|y|yes] - compress core files if not debugging them"
- @echo " EXTERN_TESTS=<path> - path to out-of-tree test_<name>.py files containing test cases"
- @echo " EXTERN_PLUGINS=<path> - path to out-of-tree plugins to be loaded by vpp under test"
- @echo " EXTERN_COV_DIR=<path> - path to out-of-tree prefix, where source, object and .gcda files can be found for coverage report"
- @echo " PROFILE=[1|y|yes] - enable profiling of test framework via cProfile module"
- @echo " PROFILE_SORT_BY=opt - sort profiling report by opt - consult cProfile documentation for possible values (default: cumtime)"
- @echo " PROFILE_OUTPUT=file - output profiling info to file - use absolute path (default: stdout)"
- @echo " TEST_DEBUG=[1|y|yes] - enable debugging of the test framework itself (expert)"
- @echo " API_FUZZ=[1|y|yes] - enable VPP api fuzz testing"
- @echo " RND_SEED=<seed> - Seed RND with given seed"
+ @echo "Environment variables controlling test runs:"
@echo ""
- @echo "Starting VPP in GDB for use with DEBUG=attach:"
+ @echo " V=[0|1|2]"
+ @echo " set test verbosity level: 0=ERROR, 1=INFO, 2=DEBUG"
@echo ""
- @echo " test-start-vpp-in-gdb - start VPP in gdb (release)"
- @echo " test-start-vpp-debug-in-gdb - start VPP in gdb (debug)"
+ @echo " TEST_JOBS=[<n>|auto]"
+ @echo " use at most <n> parallel python processes for test"
+ @echo " execution, if auto, set to number of available cpus"
+ @echo " (default: 1)"
@echo ""
- @echo "Creating test code coverage report:"
+ @echo " MAX_VPP_CPUS=[<n>|auto]"
+ @echo " use at most <n> cpus for running vpp"
+ @echo " 'auto' sets to number of available cpus"
+ @echo " (default: auto)"
@echo ""
- @echo " test-cov - generate code coverage report for test framework"
- @echo " test-wipe-cov - wipe code coverage report for test framework"
+ @echo " CACHE_OUTPUT=[0|n|no]"
+ @echo " disable caching VPP stdout/stderr and logging it"
+ @echo " as one block after test finishes"
+ @echo " (default: yes)"
+ @echo ""
+ @echo " FAILFAST=[1|y|yes]"
+ @echo " if enabled, stop running tests on first failure"
+ @echo " otherwise finish running whole suite"
+ @echo " (default: no)"
+ @echo ""
+ @echo " TIMEOUT=<timeout>"
+ @echo " fail test suite if any single test takes longer"
+ @echo " than <timeout> (in seconds) to finish"
+ @echo " (default: 600)"
@echo ""
- @echo "Verifying code-style:"
+ @echo " RETRIES=<n>"
+ @echo " retry failed tests <n> times"
+ @echo " (default: 0)"
@echo ""
- @echo " test-checkstyle - check PEP8 compliance"
+ @echo " DEBUG=<type>"
+ @echo " configure VPP debugging:"
+ @echo " DEBUG=core"
+ @echo " detect coredump and load it in gdb on crash"
+ @echo ""
+ @echo " DEBUG=gdb"
+ @echo " print VPP PID and wait for user input before"
+ @echo " running and tearing down a testcase, allowing"
+ @echo " easy gdb attach"
+ @echo ""
+ @echo " DEBUG=gdbserver"
+ @echo " same as above, but run gdb inside a gdb server"
+ @echo ""
+ @echo " DEBUG=attach"
+ @echo " attach to existing vpp in running in gdb"
+ @echo " (see test-start-vpp-in-gdb)"
+ @echo " (default: none)"
+ @echo ""
+ @echo " STEP=[1|y|yes]"
+ @echo " enable stepping through a testcase"
+ @echo " (default: no)"
+ @echo ""
+ @echo " SANITY=[0|n|no]"
+ @echo " disable sanity import of vpp-api/vpp sanity"
+ @echo " run before running tests"
+ @echo " (default: yes)"
+ @echo ""
+ @echo " EXTENDED_TESTS=[1|y|yes]"
+ @echo " run extended tests"
+ @echo " (default: no)"
+ @echo ""
+ @echo " TEST=<filter>,[<filter>],..."
+ @echo " only run tests matching one or more comma-delimited"
+ @echo " filter expressions"
+ @echo ""
+ @echo " simple filter:"
+ @echo " file name or file suffix select all tests from a file"
+ @echo " examples:"
+ @echo " TEST=test_bfd"
+ @echo " TEST=bfd"
+ @echo " equivalent expressions selecting all"
+ @echo " tests defined in test_bfd.py"
+ @echo ""
+ @echo " wildcard filter:"
+ @echo " advanced filtering based on test file, test class"
+ @echo " and test function"
+ @echo " each filter expression is in the form of"
+ @echo " <file>.<class>.<test function>"
+ @echo " each of the tokens can be left empty or replaced"
+ @echo " with '*' to select all objects available"
+ @echo " examples:"
+ @echo " TEST=test_bfd.*.*"
+ @echo " TEST=test_bfd.."
+ @echo " TEST=bfd.*.*"
+ @echo " TEST=bfd.."
+ @echo " select all tests defined in test_bfd.py"
+ @echo " TEST=bfd.BFDAPITestCase.*"
+ @echo " TEST=bfd.BFDAPITestCase."
+ @echo " select all tests from test_bfd.py"
+ @echo " which are part of BFDAPITestCase class"
+ @echo " TEST=bfd.BFDAPITestCase.test_add_bfd"
+ @echo " select a single test named test_add_bfd"
+ @echo " from test_bfd.py/BFDAPITestCase"
+ @echo " TEST=..test_add_bfd"
+ @echo " TEST=*.*.test_add_bfd"
+ @echo " select all test functions named test_add_bfd"
+ @echo " from all files/classes"
+ @echo " TEST=bfd,ip4,..test_icmp_error"
+ @echo " select all test functions in test_bfd.py,"
+ @echo " test_ip4.py and all test functions named"
+ @echo " 'test_icmp_error' in all files"
+ @echo " (default: '')"
+ @echo ""
+ @echo " VARIANT=<variant>"
+ @echo " specify which march node variant to unit test"
+ @echo " e.g. VARIANT=skx test the skx march variants"
+ @echo " e.g. VARIANT=icl test the icl march variants"
+ @echo " (default: '')"
+ @echo ""
+ @echo " COREDUMP_SIZE=<size>"
+ @echo " pass <size> as unix { coredump-size <size> } argument"
+ @echo " to vpp, e.g. COREDUMP_SIZE=4g or COREDUMP_SIZE=unlimited"
+ @echo " (default: '')"
+ @echo ""
+ @echo " COREDUMP_COMPRESS=[1|y|yes]"
+ @echo " if no debug option is set, compress any core files"
+ @echo " (default: no)"
+ @echo ""
+ @echo " EXTERN_TESTS=<path>"
+ @echo " include out-of-tree test_*.py files under <path>"
+ @echo " (default: '')"
+ @echo ""
+ @echo " EXTERN_PLUGINS=<path>"
+ @echo " load out-of-tree vpp plugins in <path>"
+ @echo " (default: '')"
+ @echo ""
+ @echo " EXTERN_COV_DIR=<path>"
+ @echo " path to out-of-tree prefix, where source, object"
+ @echo " and .gcda files can be found for coverage report"
+ @echo " (default: '')"
+ @echo ""
+ @echo " PROFILE=[1|y|yes]"
+ @echo " enable profiling of test framework via cProfile module"
+ @echo " (default: no)"
+ @echo ""
+ @echo " PROFILE_SORT_BY=opt"
+ @echo " sort profiling report by opt - see cProfile documentation"
+ @echo " for possible values"
+ @echo " (default: cumtime)"
+ @echo ""
+ @echo " PROFILE_OUTPUT=file"
+ @echo " output profiling info to file - use absolute path"
+ @echo " (default: stdout)"
+ @echo ""
+ @echo " TEST_DEBUG=[1|y|yes]"
+ @echo " enable debugging of the test framework itself (expert)"
+ @echo " (default: no)"
+ @echo ""
+ @echo " TEST_GCOV=[1|y|yes]"
+ @echo " enable tests specifically designed soley for code coverage"
+ @echo " (default: no)"
+ @echo ""
+ @echo " API_FUZZ=[1|y|yes]"
+ @echo " enable VPP api fuzz testing"
+ @echo " (default: no)"
+ @echo ""
+ @echo " RND_SEED=<seed>"
+ @echo " random seed used by test framework"
+ @echo " (default: time.time())"
+ @echo ""
+ @echo "Starting VPP in GDB for use with DEBUG=attach:"
+ @echo ""
+ @echo " test-start-vpp-in-gdb - start VPP in gdb (release)"
+ @echo " test-start-vpp-debug-in-gdb - start VPP in gdb (debug)"
@echo ""
Code Review / vpp.git / blobdiff