From patchwork Tue Jan 13 18:49:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 43083 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D360526CFB for ; Tue, 13 Jan 2015 18:49:49 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id x12sf2620291wgg.0 for ; Tue, 13 Jan 2015 10:49:49 -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=X8MUzaMwIX+nMmSdS9wniYb9dZbcUOCyTuTOIIWkydo=; b=YTMIqg3zFHOiQZQoaeiZ1QcG1RNDdvsf4I6bhQiAJtJ7wYl0Ef2JcZ+OR4UZ0Os5Vj qb6a2IU/A4l8eMr7f/JwFffQBjMS+oTQYOKVo0AF+Yua8IY78V42Fzyg6mXs5neXetkY L3QonpLygEVv5PN10jJAc4Za0QhAEMQT37azDE3A7hskjOnVKteeBjBB5R18QTSOJwB4 WcxWp2/iQdGQTj2GVSXrUQLcavHZPqZyC4u06aaXKjdo7khVK48YfOh1tR/+23Cbkf5u xOTCC1IMwmQ0mgkp2sDKixwHlKSIeyADepMQxY+gmlolTGS4RPyBXpbr6q89YKhuefA9 liJQ== X-Gm-Message-State: ALoCoQk3OdnspBdpECYDcJ2I6F7TaZ0UW7y6BgAGBxuAwdFaIAwNEurGExsAxQhDcik2GJquoP/l X-Received: by 10.152.37.193 with SMTP id a1mr2310047lak.3.1421174989111; Tue, 13 Jan 2015 10:49:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.98 with SMTP id l2ls31569laf.73.gmail; Tue, 13 Jan 2015 10:49:48 -0800 (PST) X-Received: by 10.112.166.73 with SMTP id ze9mr43130835lbb.38.1421174988840; Tue, 13 Jan 2015 10:49:48 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id js7si25062895lbc.58.2015.01.13.10.49.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Jan 2015 10:49:48 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id l4so4128544lbv.11 for ; Tue, 13 Jan 2015 10:49:48 -0800 (PST) X-Received: by 10.152.6.132 with SMTP id b4mr44387950laa.59.1421174988745; Tue, 13 Jan 2015 10:49:48 -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 c8csp1469362lbb; Tue, 13 Jan 2015 10:49:47 -0800 (PST) X-Received: by 10.224.137.129 with SMTP id w1mr61080947qat.91.1421174987316; Tue, 13 Jan 2015 10:49:47 -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 u10si27934270qcd.1.2015.01.13.10.49.46 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 13 Jan 2015 10:49:47 -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 1YB6XA-0006za-KW; Tue, 13 Jan 2015 18:49:44 +0000 Received: from mail-qc0-f174.google.com ([209.85.216.174]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YB6X0-0006zB-Qv for lng-odp@lists.linaro.org; Tue, 13 Jan 2015 18:49:34 +0000 Received: by mail-qc0-f174.google.com with SMTP id c9so3720753qcz.5 for ; Tue, 13 Jan 2015 10:49:29 -0800 (PST) X-Received: by 10.140.29.138 with SMTP id b10mr58708060qgb.34.1421174969511; Tue, 13 Jan 2015 10:49:29 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws ([98.221.136.245]) by mx.google.com with ESMTPSA id i49sm18331825qge.48.2015.01.13.10.49.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jan 2015 10:49:28 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Tue, 13 Jan 2015 13:49:22 -0500 Message-Id: <1421174962-23001-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421174962-23001-1-git-send-email-mike.holmes@linaro.org> References: <1421174962-23001-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v2 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.217.180 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 Reviewed-by: Ciprian Barbu --- Note that this cleans up the selection on what is to be run. On systems that do not have CUnit in the path an additional argument is now needed. This however makes uniform the support for running tests on executables in the example directories and possible platform implementation specific tests all in the same framework. --enable-test-vald Requires CUnit support, if that is not in the path it can be pointed to via --with-cunit-path if required --enable-test-perf Can be selected wihtout any cunit support configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 6 +++++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 440cc63..c9464ca 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_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" @@ -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_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 c03294c..8e03392 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,10 +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 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 +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 endif