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

libmemif: unit test update, continue configure if check module missing

Browse Source 
Change-Id: I11ef4e7dcf1759eb3545be5db2a7196d1217a6dd
Signed-off-by: Jakub Grajciar <Jakub.Grajciar@pantheon.tech>
This commit is contained in:
Jakub Grajciar
2017-11-20 13:11:50 +01:00
committed by Damjan Marion
parent bd846cdc5d
commit c62a63dd05
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extras/libmemif/Makefile.am
View File

@ -80,10 +80,11 @@ icmpr_mt_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
noinst_PROGRAMS = icmpr icmpr-epoll icmpr-mt
check_PROGRAMS = unit_test
include_HEADERS = src/libmemif.h src/memif.h
lib_LTLIBRARIES = libmemif.la
if USE_CHECK
check_PROGRAMS = unit_test
TESTS = $(check_PROGRAMS)
endif

3
extras/libmemif/configure.ac
View File

@ -4,7 +4,8 @@ AM_INIT_AUTOMAKE
AM_SILENT_RULES([yes])
AC_PREFIX_DEFAULT([/usr])
PKG_CHECK_MODULES([CHECK], [check])
PKG_CHECK_MODULES([CHECK], [check], [HAVE_CHECK=1], [HAVE_CHECK=0])
AM_CONDITIONAL([USE_CHECK],[test "$HAVE_CHECK" -eq 1])
AC_PROG_CC

10
extras/libmemif/test/main_test.c
View File

@ -437,7 +437,7 @@ START_TEST (test_buffer_alloc)
qid = 0;
if ((err =
memif_buffer_alloc (conn, qid, bufs, max_buf,
&buf)) != MEMIF_ERR_SUCCESS)
&buf, 0)) != MEMIF_ERR_SUCCESS)
ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
ck_assert_uint_eq (buf, max_buf);
@ -451,7 +451,7 @@ START_TEST (test_buffer_alloc)
qid = 1;
if ((err =
memif_buffer_alloc (conn, qid, bufs, max_buf,
&buf)) != MEMIF_ERR_SUCCESS)
&buf, 0)) != MEMIF_ERR_SUCCESS)
ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
ck_assert_uint_eq (buf, max_buf);
@ -466,7 +466,7 @@ START_TEST (test_buffer_alloc)
qid = 2;
if ((err =
memif_buffer_alloc (conn, qid, bufs, max_buf,
&buf)) != MEMIF_ERR_SUCCESS)
&buf, 0)) != MEMIF_ERR_SUCCESS)
ck_assert_msg (err == MEMIF_ERR_QID, "err code: %u, err msg: %s", err,
memif_strerror (err));
@ -528,7 +528,7 @@ START_TEST (test_tx_burst)
qid = 0;
if ((err =
memif_buffer_alloc (conn, qid, bufs, max_buf,
&buf)) != MEMIF_ERR_SUCCESS)
&buf, 0)) != MEMIF_ERR_SUCCESS)
ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
ck_assert_uint_eq (buf, max_buf);
@ -549,7 +549,7 @@ START_TEST (test_tx_burst)
qid = 1;
if ((err =
memif_buffer_alloc (conn, qid, bufs, max_buf,
&buf)) != MEMIF_ERR_SUCCESS)
&buf, 0)) != MEMIF_ERR_SUCCESS)
ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
ck_assert_uint_eq (buf, max_buf);