tests: run vapi tests by default

Type: fix

Change-Id: I7b190507446fca745fc4bc6abbdeed48f55abdb9
Signed-off-by: Klement Sekera <ksekera@cisco.com>

diff --git a/test/Makefile b/test/Makefile
index 66c8f8a..ca861b3 100644 (file)
--- 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 de219b1..6ec1213 100644 (file)
--- 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 7bb815d..e010415 100644 (file)
--- 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 """