From patchwork Tue Jan 20 18:19:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 43419 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BE1C72034D for ; Tue, 20 Jan 2015 18:20:31 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id f15sf7331320lbj.2 for ; Tue, 20 Jan 2015 10:20:30 -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=+a4TB1Sli7vqMCq61DXNX3HAznKV17bajyEySASIbW8=; b=eqodc2uN6oJlykGjlfOzp3Dp9/OvdTur64N6Tygcf5QXGoBez8v+l1x8lbB+wf8AQJ x2x6UhQI/hm3LZ93B3fegJWAlDb3aLjnPAmZo7GuHi+1ZVJrqv/bGuxG4hRVh6P6lQYQ aFzkHAaLhFPhKdEUQzmxcPSBfTdsdJNmuHQpsoCv9nCI68qbbEXZwABkxJKOdxw6gErA iJBMgpk+LyD1h8TJnubiPg+HAcQPNgdqygRWKa7kYP0nPNMGbb2sqi5k/1V5LwO4pfh0 cqxIO0c5mrxMWHAv7D1SrXZTZx+jFdPGrGAVVGvx4eJgiAWkTIkdZUjo0wmgpGxxhI5L H/xQ== X-Gm-Message-State: ALoCoQmOAiAirkDewfUGzOsf0voFUBW6RVmwubV62Nn0RxzGBVWt+HaViA9a5Y+YxYnwLEMxHrbC X-Received: by 10.180.108.197 with SMTP id hm5mr1006276wib.4.1421778030662; Tue, 20 Jan 2015 10:20:30 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.169 with SMTP id uf9ls687496lac.75.gmail; Tue, 20 Jan 2015 10:20:30 -0800 (PST) X-Received: by 10.112.30.71 with SMTP id q7mr40188751lbh.41.1421778030494; Tue, 20 Jan 2015 10:20:30 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id at6si9608103lac.43.2015.01.20.10.20.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 10:20:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so35893367lab.13 for ; Tue, 20 Jan 2015 10:20:30 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr40527302lag.50.1421778030276; Tue, 20 Jan 2015 10:20:30 -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 c8csp1508993lbb; Tue, 20 Jan 2015 10:20:29 -0800 (PST) X-Received: by 10.229.68.202 with SMTP id w10mr28219301qci.13.1421778028672; Tue, 20 Jan 2015 10:20:28 -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 w34si2378181qgw.36.2015.01.20.10.20.26 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Jan 2015 10:20:28 -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 1YDdPa-0004x9-9Y; Tue, 20 Jan 2015 18:20:22 +0000 Received: from mail-qc0-f171.google.com ([209.85.216.171]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YDdPV-0004x4-LZ for lng-odp@lists.linaro.org; Tue, 20 Jan 2015 18:20:17 +0000 Received: by mail-qc0-f171.google.com with SMTP id s11so13339588qcv.2 for ; Tue, 20 Jan 2015 10:20:12 -0800 (PST) X-Received: by 10.140.95.105 with SMTP id h96mr43838458qge.64.1421778003320; Tue, 20 Jan 2015 10:20:03 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws ([98.221.136.245]) by mx.google.com with ESMTPSA id r16sm864248qay.10.2015.01.20.10.20.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jan 2015 10:20:02 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Tue, 20 Jan 2015 13:19:44 -0500 Message-Id: <1421777984-11587-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: patch Subject: [lng-odp] [PATCH v3] 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.54 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 --- V3 Rebase + remove redundant bin_PROGRAMS configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 7 +++++-- 4 files changed, 44 insertions(+), 7 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/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..e4f640a 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,10 +5,13 @@ 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} -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers +endif + +if cunit_support +bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_synchronizers odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer endif