From patchwork Fri Jan 23 03:23:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 43563 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9D274218DB for ; Fri, 23 Jan 2015 03:24:27 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y19sf2864214wgg.2 for ; Thu, 22 Jan 2015 19:24:26 -0800 (PST) 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:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=Ifcwh7OjgEBkPn+HlvtmgfFZ+q3NknvHmEabxedPEfw=; b=FNuoA0N6iyr3M4VAHJ/wuPXluz0OyteQppJHaRiG+tGThotcTOmjalo8t8eW5+8zp/ ku9Zr575ZwQ5Q6PM8nGOfhped25iU7KJAPHBPYNBbIcxuzTeUROulvSK/tRwmMvKiccR 3/XgLxQqHaXuXYOVmP59f41g6B/1FzvcUIrQFAW1FwnV4me/VHyrLs49DcYYzZVExd3G hm/0sWuBhNfYwyFdoCpgc51ndgtokxeLzo6HAoTPjHX/Ut9sUSGOH+Dv59nfLu6mej4t lUfiuQZbunOBMDxD5RDv4FiGH+OpLjA/SNSDLpleFQM73jP4PTluywfKxlWbmSZFXQRk xeqQ== X-Gm-Message-State: ALoCoQkcN8BEdoBBAmvSjQHKhtyIcTzMCbHOmLopueZtoNjlYwcEqvJqgqByhmFtBisM+XlfxrVB X-Received: by 10.180.79.133 with SMTP id j5mr3955707wix.0.1421983466899; Thu, 22 Jan 2015 19:24:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.202.198 with SMTP id kk6ls214892lac.103.gmail; Thu, 22 Jan 2015 19:24:26 -0800 (PST) X-Received: by 10.152.21.134 with SMTP id v6mr5016105lae.13.1421983466501; Thu, 22 Jan 2015 19:24:26 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id rq8si207182lbb.78.2015.01.22.19.24.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 19:24:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ge10so5132283lab.10 for ; Thu, 22 Jan 2015 19:24:26 -0800 (PST) X-Received: by 10.112.170.36 with SMTP id aj4mr4978712lbc.3.1421983466285; Thu, 22 Jan 2015 19:24:26 -0800 (PST) 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.112.9.200 with SMTP id c8csp102096lbb; Thu, 22 Jan 2015 19:24:25 -0800 (PST) X-Received: by 10.224.131.70 with SMTP id w6mr9968033qas.78.1421983464452; Thu, 22 Jan 2015 19:24:24 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id r8si352563qak.127.2015.01.22.19.24.22 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 22 Jan 2015 19:24:24 -0800 (PST) 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-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YEUr6-0006Cv-8Z; Fri, 23 Jan 2015 03:24:20 +0000 Received: from mail-qa0-f47.google.com ([209.85.216.47]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YEUr1-0006Cn-2r for lng-odp@lists.linaro.org; Fri, 23 Jan 2015 03:24:15 +0000 Received: by mail-qa0-f47.google.com with SMTP id n8so4262125qaq.6 for ; Thu, 22 Jan 2015 19:24:09 -0800 (PST) X-Received: by 10.140.22.99 with SMTP id 90mr9449957qgm.72.1421983449852; Thu, 22 Jan 2015 19:24:09 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws ([98.221.136.245]) by mx.google.com with ESMTPSA id i51sm355781qgf.37.2015.01.22.19.24.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 19:24:09 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Thu, 22 Jan 2015 22:23:59 -0500 Message-Id: <1421983439-10753-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: patch Subject: [lng-odp] [PATCH v4] configure.ac: performance: add tests to make check 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.215.51 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 Allow the test/performance directory to be optionally included when make check is run Signed-off-by: Mike Holmes --- v5 remove accidential comments left in configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/Makefile.am | 6 +++++- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 5 +++-- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 39610ee..2934791 100644 --- a/configure.ac +++ b/configure.ac @@ -65,21 +65,47 @@ AC_SUBST(SDK_INSTALL_PATH) AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) +########################################################################## +# Enable/disable Unit tests +########################################################################## +cunit_support=no +AC_ARG_ENABLE([cunit_support], + [ --enable-cunit-support include cunit infrastructure], + [if test x$enableval = xyes; then + cunit_support=yes + fi]) + ########################################################################## # Enable/disable Unit tests ########################################################################## -AC_ARG_ENABLE([cunit], - [ --enable-cunit Enable/disable cunit], +test_vald=no +AC_ARG_ENABLE([test_vald], + [ --enable-test-vald run test in test/validation], [if test x$enableval = xyes; then + test_vald=yes cunit_support=yes fi]) +AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) + +########################################################################## +# Enable/disable test-perf +########################################################################## +test_perf=no +AC_ARG_ENABLE([test-perf], + [ --enable-test-perf run test in test/performance], + [if test "x$enableval" = "xyes"; then + test_perf=yes + fi]) + +AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) + ########################################################################## # Set optional CUnit path ########################################################################## AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR Path to Cunit libs and headers], +AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], [(or in the default path if not specified).]), [CUNIT_PATH=$withval AM_CPPFLAGS="$AM_CPPFLAGS -I$CUNIT_PATH/include" @@ -162,7 +188,7 @@ else cunit_support=no fi -AM_CONDITIONAL([ODP_CUNIT_ENABLED], [test x$cunit_support = xyes ]) +AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) ########################################################################## # Check for OpenSSL availability @@ -226,7 +252,6 @@ AC_SUBST([LDFLAGS]) AC_OUTPUT AC_MSG_RESULT([ $PACKAGE $VERSION - ======== with_platform: ${with_platform} prefix: ${prefix} @@ -243,4 +268,6 @@ AC_MSG_RESULT([ am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} cunit: ${cunit_support} + test_vald: ${test_vald} + test_perf: ${test_perf} ]) diff --git a/test/Makefile.am b/test/Makefile.am index afaa1d0..ec2b248 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1,5 @@ -SUBDIRS = api_test validation performance +SUBDIRS = api_test performance + +if cunit_support + SUBDIRS += validation +endif diff --git a/test/performance/.gitignore b/test/performance/.gitignore index a229e10..9ccb102 100644 --- a/test/performance/.gitignore +++ b/test/performance/.gitignore @@ -1 +1,3 @@ +*.log +*.trs odp_scheduling diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 359c4f0..8b2e0e2 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -1,5 +1,10 @@ include $(top_srcdir)/test/Makefile.inc +if test_perf +TESTS = odp_scheduling +check_PROGRAMS = ${bin_PROGRAMS} +endif + bin_PROGRAMS = odp_scheduling odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 400d758..0f5799c 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,13 +5,14 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} -if ODP_CUNIT_ENABLED +if test_vald TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system odp_timer odp_time odp_synchronizers check_PROGRAMS = ${bin_PROGRAMS} +endif + bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer -endif dist_odp_init_SOURCES = odp_init.c dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c