From 871349371a62f1f20b159b6afead8e84f8a2322b Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 7 Mar 2017 11:39:27 +0100 Subject: make test: split into basic and extended tests Implement plumbing to allow decorating tests as extended, e.g.: @unittest.skipUnless(running_extended_tests(), "part of extended tests") both methods and classes can be decorated this way. Change make test and make test-debug to run only non-extended tests. Introduce make test-all and make test-all-debug to run the full suite. Run full suite as part of make verify. Decorate most BFD tests as extended. Change-Id: I3bc64f59e9fe238f7f767d7e043dc165d03e9dfa Signed-off-by: Klement Sekera --- Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9161a384..7faba3b6 100644 --- a/Makefile +++ b/Makefile @@ -82,8 +82,10 @@ help: @echo " run-release - run release binary" @echo " debug - run debug binary with debugger" @echo " debug-release - run release binary with debugger" - @echo " test - build and run functional tests" - @echo " test-debug - build and run functional tests (debug build)" + @echo " test - build and run (basic) functional tests" + @echo " test-debug - build and run (basic) functional tests (debug build)" + @echo " test-all - build and run (all) functional tests" + @echo " test-all-debug - build and run (all) functional tests (debug build)" @echo " test-wipe - wipe files generated by unit tests" @echo " retest - run functional tests" @echo " retest-debug - run functional tests (debug build)" @@ -221,6 +223,7 @@ define test VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \ VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \ LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \ + EXTENDED_TESTS=$(EXTENDED_TESTS) \ $(3) endef @@ -230,6 +233,14 @@ test: bootstrap test-debug: bootstrap $(call test,vpp_lite,vpp_lite_debug,test) +test-all: bootstrap + $(eval EXTENDED_TESTS=yes) + $(call test,vpp_lite,vpp_lite,test) + +test-all-debug: bootstrap + $(eval EXTENDED_TESTS=yes) + $(call test,vpp_lite,vpp_lite_debug,test) + test-help: @make -C test help @@ -368,6 +379,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) endif $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) - @make test + @make test-all -- cgit 1.2.3-korg