diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2019-09-02 15:19:41 +0000 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-09-02 16:23:19 +0000 |
| commit | be2c2a82d817decc3b8e58239e8c6828f349b97b (patch) | |
| tree | 77b49b5bba2508cb489d22ec9a0ccde5f2846edc | |
| parent | 3a350702ec24d1bde0483da1e946015c2b81e0c4 (diff) | |
tests: run vapi tests by default
Type: fix
Change-Id: I7b190507446fca745fc4bc6abbdeed48f55abdb9
Signed-off-by: Klement Sekera <ksekera@cisco.com>
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | test/ext/Makefile | 4 | ||||
| -rw-r--r-- | test/test_vapi.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/Makefile b/test/Makefile index 66c8f8a9bb7..ca861b3b3a1 100644 --- a/test/Makefile +++ b/test/Makefile @@ -191,9 +191,7 @@ sanity: verify-no-running-vpp .PHONY: ext ext: - @if [ "$(EXTENDED_TESTS)" = "yes" ]; then\ - make -C ext;\ - fi + make -C ext test-dep: verify-test-dir $(PAPI_INSTALL_DONE) diff --git a/test/ext/Makefile b/test/ext/Makefile index de219b1a5dc..6ec1213d532 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -8,6 +8,10 @@ ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) VAPI_CPPBIN= endif +ifeq ($(filter yes,$(EXTENDED_TESTS)),$(EXTENDED_TESTS)) +VOM_BIN= +endif + VAPI_LIBS = \ -L$(VPP_INSTALL_PATH)/vpp/lib \ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient diff --git a/test/test_vapi.py b/test/test_vapi.py index 7bb815d77f3..e010415fe01 100644 --- a/test/test_vapi.py +++ b/test/test_vapi.py @@ -4,11 +4,9 @@ import unittest import os import signal -from framework import VppTestCase, running_extended_tests, \ - running_on_centos, VppTestRunner, Worker +from framework import VppTestCase, running_on_centos, VppTestRunner, Worker -@unittest.skipUnless(running_extended_tests, "part of extended tests") class VAPITestCase(VppTestCase): """ VAPI test """ |