From patchwork Fri Aug 29 14:41:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 36296 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B7C122054D for ; Fri, 29 Aug 2014 14:41:41 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf15346814oah.6 for ; Fri, 29 Aug 2014 07:41:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=aJea3czXfqsvZsM8lm+ti2z079JjmL8PpTz3L9vLq+E=; b=g8MomU8jCZycDmzxsw/0xOPR8Bl3K+uxt3+6uk07iyhWptUsZOQGrfBq0ZP5XXj0WM YmO6qmFbqBt+JEg0g5GHOfTkhESWM+Ple6ycfOXHI+eO4ggxZmioJs/g7Yg+IgBQfUv3 rD7mfXiPqKYkjbqdxYRZDIiYWGwMgk51Kd3L+sTxDkPPHmlLXQkmZYrnEMZaAUuLRQEp FhNjofMtfW76QUrqfvIfSXuPtvpSDo+1fNwOLwoj0on1nlmfmLvDt4Ovnvc4kam/rNcb Cc7jAtSXttkTo7zn8GGCquswj5qJ5F7T6ic1QtuR2tNWWhKI7wbtrT2lZSTbwZZxy3Rg Z4TQ== X-Gm-Message-State: ALoCoQlvewZbTxX2XYkrzD8kGGf1lcWnPz+7PC/saLVyzmROXGLsTaNQBZF+admKPHYLlzjhpjpN X-Received: by 10.50.49.33 with SMTP id r1mr2255295ign.3.1409323301241; Fri, 29 Aug 2014 07:41:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.70 with SMTP id g64ls323017qgf.85.gmail; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr8871999vdb.27.1409323300931; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id x6si287671vdw.20.2014.08.29.07.41.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Aug 2014 07:41:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id im17so2624439vcb.27 for ; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) X-Received: by 10.52.73.202 with SMTP id n10mr209223vdv.86.1409323300808; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp27177vcb; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) X-Received: by 10.224.103.65 with SMTP id j1mr18317574qao.17.1409323300253; Fri, 29 Aug 2014 07:41:40 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id 74si334408qgx.64.2014.08.29.07.41.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 Aug 2014 07:41:40 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XNNMw-0002qc-A9; Fri, 29 Aug 2014 14:41:38 +0000 Received: from mail-qg0-f54.google.com ([209.85.192.54]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XNNMo-0002qS-C5 for lng-odp@lists.linaro.org; Fri, 29 Aug 2014 14:41:30 +0000 Received: by mail-qg0-f54.google.com with SMTP id q107so2287370qgd.41 for ; Fri, 29 Aug 2014 07:41:25 -0700 (PDT) X-Received: by 10.140.91.6 with SMTP id y6mr17187443qgd.58.1409323285066; Fri, 29 Aug 2014 07:41:25 -0700 (PDT) Received: from fedora1.holmesfamily.ws (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by mx.google.com with ESMTPSA id x6sm482743qas.27.2014.08.29.07.41.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Aug 2014 07:41:24 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Fri, 29 Aug 2014 10:41:11 -0400 Message-Id: <1409323271-58034-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH v2] test/unit: add odp_buffer_test X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mike.holmes@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Mike Holmes Signed-off-by: Anders Roxell --- v2: Add dependencies Add cross compile Add comments on test cases .gitignore | 1 + DEPENDENCIES | 19 +++- configure.ac | 20 ++++ test/Makefile.am | 2 +- test/api_test/Makefile.am | 1 + test/unit/Makefile.am | 11 +++ test/unit/odp_buffer_test.c | 222 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 274 insertions(+), 2 deletions(-) create mode 100644 test/unit/Makefile.am create mode 100644 test/unit/odp_buffer_test.c diff --git a/.gitignore b/.gitignore index 6a97f17..1000401 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ odp_pktio odp_timer_test odp_generator odp_l2fwd +odp_buffer doxygen-doc diff --git a/DEPENDENCIES b/DEPENDENCIES index 9597511..f54724d 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -75,4 +75,21 @@ Prerequisites for building the OpenDataPlane (ODP) API # Or build 64 bit version of ODP $ ./configure --host=aarch64-linux-gnu \ --with-openssl-path=/home/user/src/install-openssl-aarch64 - $ make \ No newline at end of file + $ make + +4. packages needed to build API tests + +4.1 Native compile + + # Debian/Ubuntu + $ apt-get install libcunit1-dev + + On CentOS/RedHat/Fedora systems: + $ su -c 'yum update CUnit' + +4.2 Cross compile + + $ git svn clone http://svn.code.sf.net/p/cunit/code/trunk cunit-code + $ cd cunit-code + $ ./bootstrap + $ ./configure --host=arm-linux-gnueabihf --prefix=/home/user/src/install-cunit diff --git a/configure.ac b/configure.ac index 5574f82..d63f9ef 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,25 @@ AC_ARG_ENABLE([netmap], AM_CONDITIONAL([ODP_NETMAP_ENABLED], [test x$netmap_support = xyes ]) ########################################################################## +# Enable/disable Unit tests +########################################################################## +AC_ARG_ENABLE([cunit], + [ --enable-cunit Enable/Disable cunit. See cunit-path], + [if test x$enableval = xyes; then + unit_support=yes + fi]) + +AC_ARG_WITH([cunit-path], +AC_HELP_STRING([--with-cunit-path=DIR Path to Cunit libs and headers], + [(automaticly implies --enable-cunit).]), +[CUNIT_PATH=$withval unit_support=yes +],[ AC_MSG_WARN([Cunit not found - continuing without Cunit support]) +]) + +AC_SUBST(CUNIT_PATH) +AM_CONDITIONAL([ODP_UNIT_ENABLED], [test x$unit_support = xyes ]) + +########################################################################## # Enable/disable ODP_DEBUG_PRINT ########################################################################## ODP_DEBUG=1 @@ -152,6 +171,7 @@ AC_CONFIG_FILES([Makefile example/timer/Makefile test/Makefile test/api_test/Makefile + test/unit/Makefile pkgconfig/libodp.pc]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/test/Makefile.am b/test/Makefile.am index 9bd7db1..dda7d5e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1 @@ -SUBDIRS = api_test +SUBDIRS = api_test unit diff --git a/test/api_test/Makefile.am b/test/api_test/Makefile.am index 5104454..d76bc26 100644 --- a/test/api_test/Makefile.am +++ b/test/api_test/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/test/Makefile.inc bin_PROGRAMS = odp_atomic odp_shm odp_ring odp_timer_ping + odp_atomic_LDFLAGS = $(AM_LDFLAGS) -static odp_shm_LDFLAGS = $(AM_LDFLAGS) -static odp_ring_LDFLAGS = $(AM_LDFLAGS) -static diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am new file mode 100644 index 0000000..9554ed9 --- /dev/null +++ b/test/unit/Makefile.am @@ -0,0 +1,11 @@ +include $(top_srcdir)/test/Makefile.inc + +AM_CFLAGS += -I$(CUNIT_PATH)/include +AM_LDFLAGS += -L$(CUNIT_PATH)/lib + +if ODP_UNIT_ENABLED +bin_PROGRAMS = odp_buffer +odp_buffer_LDFLAGS = $(AM_LDFLAGS) -static -lcunit +endif + +dist_odp_buffer_SOURCES = odp_buffer_test.c diff --git a/test/unit/odp_buffer_test.c b/test/unit/odp_buffer_test.c new file mode 100644 index 0000000..5bc990e --- /dev/null +++ b/test/unit/odp_buffer_test.c @@ -0,0 +1,222 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "odp.h" +#include "CUnit/Basic.h" + +#define DEFAULT_MSG_POOL_SIZE (4*1024*1024) +#define DEFAULT_MSG_SIZE (8) + +static void test_odp_buffer_addr(void) +{ + void *startaddress; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + /* correct address returned */ + pool_base = odp_shm_reserve("msg_pool1", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool1", + pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + mybuffer = odp_buffer_alloc(msg_pool); + startaddress = odp_buffer_addr(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE(startaddress != NULL); +} + +static void test_odp_buffer_size(void) +{ + size_t size; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + /* correct size returned */ + pool_base = odp_shm_reserve("msg_pool2", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool2", pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + mybuffer = odp_buffer_alloc(msg_pool); + size = odp_buffer_size(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE(size == DEFAULT_MSG_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool2_1", pool_base, + DEFAULT_MSG_POOL_SIZE, + -1, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + CU_ASSERT_TRUE(msg_pool == ODP_BUFFER_POOL_INVALID); + mybuffer = odp_buffer_alloc(msg_pool); + size = odp_buffer_size(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE(size == ODP_BUFFER_INVALID); +} + +static void test_odp_buffer_type(int type_in) +{ + int type; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + char pool_name[32]; + /* valid types */ + sprintf(pool_name, "mag_pool_%d", type_in); + pool_base = odp_shm_reserve(pool_name, + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create(pool_name, pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, type_in); + mybuffer = odp_buffer_alloc(msg_pool); + type = odp_buffer_type(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE(type == type_in); +} + +static void test_odp_buffer_type_valid(void) +{ + test_odp_buffer_type(ODP_BUFFER_TYPE_ANY); + test_odp_buffer_type(ODP_BUFFER_TYPE_RAW); + test_odp_buffer_type(ODP_BUFFER_TYPE_PACKET); + test_odp_buffer_type(ODP_BUFFER_TYPE_TIMEOUT); +} + +static void test_odp_buffer_type_invalid(void) +{ + int type; + int type_in = ODP_BUFFER_TYPE_INVALID; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + /* invalid type */ + pool_base = odp_shm_reserve("msg_pool4", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool4", pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, type_in); + /* msg_pool should fail */ + CU_ASSERT_TRUE(msg_pool == ODP_BUFFER_POOL_INVALID); + /* mybuffer should fail */ + mybuffer = odp_buffer_alloc(msg_pool); + CU_ASSERT_TRUE(mybuffer == ODP_BUFFER_INVALID); + /* type should fail */ + type = odp_buffer_type(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE(type == type_in); +} + +static void test_odp_is_scatter(void) +{ + int is_scatter; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + /* scatter is boolean */ + pool_base = odp_shm_reserve("msg_pool5", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool5", pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + mybuffer = odp_buffer_alloc(msg_pool); + is_scatter = odp_buffer_size(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_TRUE((is_scatter < 0) || (is_scatter > 1)); +} + +static void test_odp_is_valid(void) +{ + int is_valid; + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + /* valid is boolean */ + pool_base = odp_shm_reserve("msg_pool6", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool6", pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + mybuffer = odp_buffer_alloc(msg_pool); + is_valid = odp_buffer_is_valid(mybuffer); + odp_buffer_free(mybuffer); + CU_ASSERT_FALSE((is_valid < 0) || (is_valid > 1)); +} + +static void test_odp_buffer_print(void) +{ + odp_buffer_pool_t msg_pool; + odp_buffer_t mybuffer; + void *pool_base; + pool_base = odp_shm_reserve("msg_pool8", + DEFAULT_MSG_POOL_SIZE, + ODP_CACHE_LINE_SIZE); + msg_pool = odp_buffer_pool_create("msg_pool8", pool_base, + DEFAULT_MSG_POOL_SIZE, + DEFAULT_MSG_SIZE, + ODP_CACHE_LINE_SIZE, + ODP_BUFFER_TYPE_RAW); + mybuffer = odp_buffer_alloc(msg_pool); + odp_buffer_print(mybuffer); + odp_buffer_free(mybuffer); + CU_PASS("test_odp_buffer_print"); +} + +static int init_suite1(void) +{ + odp_init_global(); + return 0; +} + +static int clean_suite1(void) +{ + return 0; +} + +int main(void) +{ + CU_pSuite pSuite = NULL; + /* initialize the CUnit test registry */ + if (CUE_SUCCESS != CU_initialize_registry()) + return CU_get_error(); + /* add a suite to the registry */ + pSuite = CU_add_suite("odp_buffer_pool", init_suite1, clean_suite1); + if (NULL == pSuite) { + CU_cleanup_registry(); + return CU_get_error(); + } + /* add the tests to the suite */ + if ((NULL == CU_ADD_TEST(pSuite, test_odp_buffer_size)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_buffer_addr)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_buffer_type_valid)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_buffer_type_invalid)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_is_valid)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_is_scatter)) || + (NULL == CU_ADD_TEST(pSuite, test_odp_buffer_print))) { + CU_cleanup_registry(); + return CU_get_error(); + } + /* Run all tests using the CUnit Basic interface */ + CU_basic_set_mode(CU_BRM_VERBOSE); + CU_basic_run_tests(); + CU_cleanup_registry(); + return CU_get_error(); +}