From patchwork Wed Jan 21 19:26:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 43481 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75B15218DB for ; Wed, 21 Jan 2015 19:27:14 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf11097300eek.1 for ; Wed, 21 Jan 2015 11:27:13 -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=u/H7Jt9wLGSETsmWKPjZ/kzpEKg8eRcLGNbEi4JH/h0=; b=lqDZHc71/AsKGkxDr8Qadxl5y9zqiOtnwo4NtjX2UEiwtcgy0JO/3AKqDiWgfPHauC 7pZe9RBA6rN3RnicRKNYwckD7c3Z0gdp4MZBp7PnhC7ShEUFWNoBfbFGB8MUtcbyuXTl +VhlGBGmH87ts29OrofdmyCc8fRe4uiXyL/vTLb+bSveNsEccT/+B96BtSxbe5/T27vG jMLj4ivhN5lTVVv3Mmw8IYAI0TfMIfBNQHJPUt8Swutai5DUFgRU0s/EYpgZoT0l/YTh EhuKr3aEPs7zaPd1MrgqwjVvg0JL7hBaHcI5rSSUnZjKWKrBaKsWgCO0bJlSjwq4/X1t Q5mA== X-Gm-Message-State: ALoCoQmCT6Sq7/ctZVqYNYxGjO6aJYr5GZ9rcUEMZUpKNhwEBdhwUVzdF6ut2E/S8KUBX43gH6Hd X-Received: by 10.112.99.37 with SMTP id en5mr503454lbb.17.1421868433534; Wed, 21 Jan 2015 11:27:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.100 with SMTP id i4ls66812laa.106.gmail; Wed, 21 Jan 2015 11:27:13 -0800 (PST) X-Received: by 10.152.42.131 with SMTP id o3mr31836930lal.43.1421868433388; Wed, 21 Jan 2015 11:27:13 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id fb6si18698852lbc.117.2015.01.21.11.27.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Jan 2015 11:27:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id gm9so16024577lab.0 for ; Wed, 21 Jan 2015 11:27:13 -0800 (PST) X-Received: by 10.112.131.1 with SMTP id oi1mr45362848lbb.2.1421868432953; Wed, 21 Jan 2015 11:27:12 -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 c8csp17756lbb; Wed, 21 Jan 2015 11:27:12 -0800 (PST) X-Received: by 10.140.95.105 with SMTP id h96mr53988330qge.64.1421868431138; Wed, 21 Jan 2015 11:27:11 -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 b7si5798852qce.33.2015.01.21.11.27.08 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 21 Jan 2015 11:27:11 -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 1YE0vh-00031g-Jw; Wed, 21 Jan 2015 19:27:05 +0000 Received: from mail-qc0-f170.google.com ([209.85.216.170]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YE0vc-0002yy-7a for lng-odp@lists.linaro.org; Wed, 21 Jan 2015 19:27:00 +0000 Received: by mail-qc0-f170.google.com with SMTP id p6so12675173qcv.1 for ; Wed, 21 Jan 2015 11:26:55 -0800 (PST) X-Received: by 10.224.130.131 with SMTP id t3mr43222616qas.76.1421868414629; Wed, 21 Jan 2015 11:26:54 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws ([98.221.136.245]) by mx.google.com with ESMTPSA id c9sm4165761qas.37.2015.01.21.11.26.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jan 2015 11:26:54 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 21 Jan 2015 14:26:29 -0500 Message-Id: <1421868389-20483-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.41 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 --- v4 Improvements to not even enter dissabled directories configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/Makefile.am | 10 +++++++++- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 9 ++++++--- 5 files changed, 54 insertions(+), 9 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..be41065 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1,9 @@ -SUBDIRS = api_test validation performance +SUBDIRS = api_test + +if cunit_support + SUBDIRS += validation +endif + +if test_perf + SUBDIRS += performance +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..325ce1c 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,13 +5,16 @@ 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 +#endif dist_odp_init_SOURCES = odp_init.c dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c