ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: run vapi tests by default

Browse Source 
Type: fix

Change-Id: I7b190507446fca745fc4bc6abbdeed48f55abdb9
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
This commit is contained in:
Klement Sekera
2019-09-02 15:19:41 +00:00
committed by Andrew Yourtchenko
parent c90f4363aa
commit b0888636de
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Makefile
View File

@ -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)

4
test/ext/Makefile
View File

@ -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

8
test/ext/vapi_c_test.c
View File

@ -574,7 +574,7 @@ START_TEST (test_loopbacks_1)
clib_memset (&seen, 0, sizeof (seen));
dump = vapi_alloc_sw_interface_dump (ctx);
dump->payload.name_filter_valid = 0;
clib_memset (dump->payload.name_filter, 0,
clib_memset (&dump->payload.name_filter, 0,
sizeof (dump->payload.name_filter));
while (VAPI_EAGAIN ==
(rv =
@ -606,7 +606,7 @@ START_TEST (test_loopbacks_1)
clib_memset (&seen, 0, sizeof (seen));
dump = vapi_alloc_sw_interface_dump (ctx);
dump->payload.name_filter_valid = 0;
clib_memset (dump->payload.name_filter, 0,
clib_memset (&dump->payload.name_filter, 0,
sizeof (dump->payload.name_filter));
while (VAPI_EAGAIN ==
(rv =
@ -731,7 +731,7 @@ START_TEST (test_loopbacks_2)
sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
dump->payload.name_filter_valid = 0;
clib_memset (dump->payload.name_filter, 0,
clib_memset (&dump->payload.name_filter, 0,
sizeof (dump->payload.name_filter));
while (VAPI_EAGAIN ==
(rv =
@ -772,7 +772,7 @@ START_TEST (test_loopbacks_2)
dctx.last_called = false;
dump = vapi_alloc_sw_interface_dump (ctx);
dump->payload.name_filter_valid = 0;
clib_memset (dump->payload.name_filter, 0,
clib_memset (&dump->payload.name_filter, 0,
sizeof (dump->payload.name_filter));
while (VAPI_EAGAIN ==
(rv =

8
test/ext/vapi_cpp_test.cpp
View File

@ -148,7 +148,7 @@ START_TEST (test_loopbacks_1)
Sw_interface_dump d (con);
auto &p = d.get_request ().get_payload ();
p.name_filter_valid = 0;
memset (p.name_filter, 0, sizeof (p.name_filter));
memset (&p.name_filter, 0, sizeof (p.name_filter));
auto rv = d.execute ();
ck_assert_int_eq (VAPI_OK, rv);
WAIT_FOR_RESPONSE (d, rv);
@ -190,7 +190,7 @@ START_TEST (test_loopbacks_1)
Sw_interface_dump d (con);
auto &p = d.get_request ().get_payload ();
p.name_filter_valid = 0;
memset (p.name_filter, 0, sizeof (p.name_filter));
memset (&p.name_filter, 0, sizeof (p.name_filter));
auto rv = d.execute ();
ck_assert_int_eq (VAPI_OK, rv);
WAIT_FOR_RESPONSE (d, rv);
@ -308,7 +308,7 @@ START_TEST (test_loopbacks_2)
Sw_interface_dump d (con, std::ref (swdcb));
auto &p = d.get_request ().get_payload ();
p.name_filter_valid = 0;
memset (p.name_filter, 0, sizeof (p.name_filter));
memset (&p.name_filter, 0, sizeof (p.name_filter));
auto rv = d.execute ();
ck_assert_int_eq (VAPI_OK, rv);
WAIT_FOR_RESPONSE (d, rv);
@ -337,7 +337,7 @@ START_TEST (test_loopbacks_2)
Sw_interface_dump d (con);
auto &p = d.get_request ().get_payload ();
p.name_filter_valid = 0;
memset (p.name_filter, 0, sizeof (p.name_filter));
memset (&p.name_filter, 0, sizeof (p.name_filter));
auto rv = d.execute ();
ck_assert_int_eq (VAPI_OK, rv);
WAIT_FOR_RESPONSE (d, rv);

4
test/test_vapi.py
View File

@ -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 """