From patchwork Thu Jan 8 18:34:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 42882 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ECDD226CD8 for ; Thu, 8 Jan 2015 18:35:08 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf2208359wgh.1 for ; Thu, 08 Jan 2015 10:35:08 -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:in-reply-to :references: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=0J6P7h4dTdGkwtt1Jc91kl7P1zF6ebhINb51crHbwzI=; b=ikIITS51jlgZPU975thqnDFMN8tduJbURJVUKul/aandeSw30Lkzk1JJFyBbpdB3c6 ccSAQi/xLgUby8VukKeQxor8S/4spIvFnNu1SfMUx8eaQkPCHXnLQXOQt6GNq0KERVB7 jayrUciOFeOPagy4qPeWoS6YxZZp4FtzITNNrITMhLLOvUjCiktacwJ6n7o6Q656m0Fa wlLhKJ0VUQyavv2u1wuK4Ola9PjjizUrFeF+8NLVqnvB/SsoT8XAH3p182BY5tixE99Z yaquchWovjn4uUAoBlCP/4DbODOp+l4Jc3ccEwDyzue9Z2ZdHTFlEeuiLxPFTU2GyhVm WIXA== X-Gm-Message-State: ALoCoQlVGKCbQb4+6CSyeOmPGdjCSd7WFqMPFFYNv//Z0D7VNCVmy97nPyJuMe3kXkjuGQUh8Dqj X-Received: by 10.112.141.232 with SMTP id rr8mr1402055lbb.0.1420742108249; Thu, 08 Jan 2015 10:35:08 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.229 with SMTP id 5ls325165lap.55.gmail; Thu, 08 Jan 2015 10:35:08 -0800 (PST) X-Received: by 10.152.121.100 with SMTP id lj4mr16206427lab.58.1420742108036; Thu, 08 Jan 2015 10:35:08 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id w9si9969076lad.106.2015.01.08.10.35.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Jan 2015 10:35:08 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id s18so10739682lam.2 for ; Thu, 08 Jan 2015 10:35:08 -0800 (PST) X-Received: by 10.152.115.146 with SMTP id jo18mr16576814lab.9.1420742107901; Thu, 08 Jan 2015 10:35:07 -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 c8csp86036lbb; Thu, 8 Jan 2015 10:35:06 -0800 (PST) X-Received: by 10.140.34.204 with SMTP id l70mr17543544qgl.55.1420742105210; Thu, 08 Jan 2015 10:35:05 -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 r3si8013756qai.93.2015.01.08.10.35.04 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 08 Jan 2015 10:35:05 -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 1Y9HvC-0006fe-EN; Thu, 08 Jan 2015 18:35:02 +0000 Received: from mail-qc0-f182.google.com ([209.85.216.182]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y9Hv4-0006fE-Oi for lng-odp@lists.linaro.org; Thu, 08 Jan 2015 18:34:54 +0000 Received: by mail-qc0-f182.google.com with SMTP id r5so3707432qcx.13 for ; Thu, 08 Jan 2015 10:34:49 -0800 (PST) X-Received: by 10.229.93.132 with SMTP id v4mr18496996qcm.27.1420742089503; Thu, 08 Jan 2015 10:34:49 -0800 (PST) Received: from localhost.localdomain ([98.221.136.245]) by mx.google.com with ESMTPSA id a41sm4717788qgf.4.2015.01.08.10.34.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jan 2015 10:34:48 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Thu, 8 Jan 2015 13:34:19 -0500 Message-Id: <1420742059-7699-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420742059-7699-1-git-send-email-mike.holmes@linaro.org> References: <1420742059-7699-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/2] 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.43 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 --- configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 5 ++++- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 440cc63..dbabb20 100644 --- a/configure.ac +++ b/configure.ac @@ -60,21 +60,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_val=no +AC_ARG_ENABLE([test_val], + [ --enable-test-val run test in test/validation], [if test x$enableval = xyes; then + test_val=yes cunit_support=yes fi]) +AM_CONDITIONAL([test_val], [test x$test_val = 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" @@ -157,7 +183,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_val: ${test_val} + test_perf: ${test_perf} ]) 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 c0545b7..cb9db7d 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,9 +5,12 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} -if ODP_CUNIT_ENABLED +if test_val TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system check_PROGRAMS = ${bin_PROGRAMS} +endif + +if cunit_support bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer