From b0888636deaece4bec4e93c4faea9f9d4e7d2ea3 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Mon, 2 Sep 2019 15:19:41 +0000 Subject: tests: run vapi tests by default Type: fix Change-Id: I7b190507446fca745fc4bc6abbdeed48f55abdb9 Signed-off-by: Klement Sekera Signed-off-by: Andrew Yourtchenko --- test/ext/Makefile | 4 ++++ test/ext/vapi_c_test.c | 8 ++++---- test/ext/vapi_cpp_test.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'test/ext') 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/ext/vapi_c_test.c b/test/ext/vapi_c_test.c index d49f23023dd..32595dfe8c8 100644 --- a/test/ext/vapi_c_test.c +++ b/test/ext/vapi_c_test.c @@ -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 = diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp index 2c2a82c8a9d..401d31ca06e 100644 --- a/test/ext/vapi_cpp_test.cpp +++ b/test/ext/vapi_cpp_test.cpp @@ -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); -- cgit 1.2.3-korg