From patchwork Tue Jan 5 15:29:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 59195 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp6033004lbb; Tue, 5 Jan 2016 07:31:19 -0800 (PST) X-Received: by 10.140.242.216 with SMTP id n207mr130411368qhc.37.1452007822068; Tue, 05 Jan 2016 07:30:22 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g73si5677237qge.55.2016.01.05.07.30.21; Tue, 05 Jan 2016 07:30:22 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8C2A261745; Tue, 5 Jan 2016 15:30:21 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=VTxro5zd; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4D39561737; Tue, 5 Jan 2016 15:29:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C0AB16173D; Tue, 5 Jan 2016 15:29:44 +0000 (UTC) Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by lists.linaro.org (Postfix) with ESMTPS id 3650D615E7 for ; Tue, 5 Jan 2016 15:29:43 +0000 (UTC) Received: by mail-qk0-f171.google.com with SMTP id p186so61336884qke.0 for ; Tue, 05 Jan 2016 07:29:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mSe3g8EQGokcgkRDwaBGAiBE/80Nmn1M+ZsPFTkj/BI=; b=VTxro5zdIsPqThAYm8DymcwcRuYntjN56mOZmsGcZoci4EY2EqBD1ewQ18FzRV95I1 OBFhx/qaXHqoORx7/jiUDsvd9J8sD/6htQlAN8uq9L6rNnfYwESfcvaaK/l8+D97nVvd SdVYIwNdOFq3CnARGD/Qhz8wZQ4IuoSV8Q1WI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mSe3g8EQGokcgkRDwaBGAiBE/80Nmn1M+ZsPFTkj/BI=; b=YSmLcnGleUNn1xpqxbtUdn4Bl/qC61rpLoQ901Nw0R/Gb4wMXV3UXUKo9J/8M9dacF jmfFSdy7yt+9Xl0CmRlzQP6mdZpXQU5N1Jl/f8od4V9pIxiv8cwzsShlycJ4Bql1bXX3 mzs/gmVrXsmVuuN/QNfmDGMbkJOuleRujIFuevaS3+4nQETqwfEGXYQD4hjGlH7gAk5f KbT96F1FZpKk74ew90qEFtabAxnLWR0v+Ui0wdd84HFHT08i/FyoqiIZFVTNAoA4SXOb N7H30qX5H358ZIrvvR3HWh7kyCLObjKlLyZv6vYyEsd79cLog1UX1Qd8P31cBdbCTTQj JKmQ== X-Gm-Message-State: ALoCoQmMaeTFt7ftQ3Bsxx1cZwuVKg6HsF6+OyGW8DyRbYgA4Ujlkr65DfbsEKSbmqyd19F3eRD6fjnMLzq1HvEajpxnQnijtg== X-Received: by 10.55.27.146 with SMTP id m18mr120172978qkh.84.1452007782912; Tue, 05 Jan 2016 07:29:42 -0800 (PST) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id w14sm42157266qge.24.2016.01.05.07.29.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jan 2016 07:29:42 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Tue, 5 Jan 2016 10:29:31 -0500 Message-Id: <1452007772-11744-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452007772-11744-1-git-send-email-mike.holmes@linaro.org> References: <1452007772-11744-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 1/2] linux-generic: test: move validation tests to their own directory X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" 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" Simplify adding platform performance tests by mirroring the test directory structure and moving the validation tests to their own directory. Signed-off-by: Mike Holmes --- platform/linux-generic/m4/configure.m4 | 3 +- platform/linux-generic/test/Makefile.am | 51 ++-------------------- .../test/{ => validation}/Makefile.am | 14 +----- .../test/{ => validation}/pktio/.gitignore | 0 .../test/{ => validation}/pktio/Makefile.am | 0 .../test/{ => validation}/pktio/pktio_env | 0 .../test/{ => validation}/pktio/pktio_run | 0 .../test/{ => validation}/pktio/pktio_run_pcap | 0 .../test/{ => validation}/pktio/pktio_run_tap | 0 test/performance/odp_l2fwd_run | 6 +-- 10 files changed, 10 insertions(+), 64 deletions(-) copy platform/linux-generic/test/{ => validation}/Makefile.am (88%) rename platform/linux-generic/test/{ => validation}/pktio/.gitignore (100%) rename platform/linux-generic/test/{ => validation}/pktio/Makefile.am (100%) rename platform/linux-generic/test/{ => validation}/pktio/pktio_env (100%) rename platform/linux-generic/test/{ => validation}/pktio/pktio_run (100%) rename platform/linux-generic/test/{ => validation}/pktio/pktio_run_pcap (100%) rename platform/linux-generic/test/{ => validation}/pktio/pktio_run_tap (100%) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index df6dc64..97c15fa 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -23,4 +23,5 @@ m4_include([platform/linux-generic/m4/odp_pcap.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/Makefile - platform/linux-generic/test/pktio/Makefile]) + platform/linux-generic/test/validation/Makefile + platform/linux-generic/test/validation/pktio/Makefile]) diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index e629872..3cf638d 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,56 +1,13 @@ -include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation - -ODP_MODULES = pktio +SUBDIRS = if test_vald -TESTS = pktio/pktio_run \ - pktio/pktio_run_tap \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/config/config_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \ - ${top_builddir}/test/validation/synchronizers/synchronizers_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) - -SUBDIRS = $(ODP_MODULES) - -if HAVE_PCAP -TESTS += pktio/pktio_run_pcap +SUBDIRS += validation endif -endif - -dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER) - -test_SCRIPTS = $(dist_check_SCRIPTS) - -tests-validation.env: - echo "TESTS=\"$(TESTS)\"" > $@ - echo "$(TESTS_ENVIRONMENT)" >> $@ - echo "$(LOG_COMPILER)" >> $@ if test_installdir installcheck-local: $(DESTDIR)/$(testdir)/run-test endif -#performance tests refer to pktio_env -if test_perf -SUBDIRS = pktio -endif +dist_check_SCRIPTS = run-test $(LOG_COMPILER) +test_SCRIPTS = $(dist_check_SCRIPTS) \ No newline at end of file diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/validation/Makefile.am similarity index 88% copy from platform/linux-generic/test/Makefile.am copy to platform/linux-generic/test/validation/Makefile.am index e629872..39c6cdd 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/validation/Makefile.am @@ -3,7 +3,6 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation ODP_MODULES = pktio -if test_vald TESTS = pktio/pktio_run \ pktio/pktio_run_tap \ ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ @@ -34,9 +33,8 @@ SUBDIRS = $(ODP_MODULES) if HAVE_PCAP TESTS += pktio/pktio_run_pcap endif -endif -dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER) +dist_check_SCRIPTS = tests-validation.env test_SCRIPTS = $(dist_check_SCRIPTS) @@ -44,13 +42,3 @@ tests-validation.env: echo "TESTS=\"$(TESTS)\"" > $@ echo "$(TESTS_ENVIRONMENT)" >> $@ echo "$(LOG_COMPILER)" >> $@ - -if test_installdir -installcheck-local: - $(DESTDIR)/$(testdir)/run-test -endif - -#performance tests refer to pktio_env -if test_perf -SUBDIRS = pktio -endif diff --git a/platform/linux-generic/test/pktio/.gitignore b/platform/linux-generic/test/validation/pktio/.gitignore similarity index 100% rename from platform/linux-generic/test/pktio/.gitignore rename to platform/linux-generic/test/validation/pktio/.gitignore diff --git a/platform/linux-generic/test/pktio/Makefile.am b/platform/linux-generic/test/validation/pktio/Makefile.am similarity index 100% rename from platform/linux-generic/test/pktio/Makefile.am rename to platform/linux-generic/test/validation/pktio/Makefile.am diff --git a/platform/linux-generic/test/pktio/pktio_env b/platform/linux-generic/test/validation/pktio/pktio_env similarity index 100% rename from platform/linux-generic/test/pktio/pktio_env rename to platform/linux-generic/test/validation/pktio/pktio_env diff --git a/platform/linux-generic/test/pktio/pktio_run b/platform/linux-generic/test/validation/pktio/pktio_run similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run rename to platform/linux-generic/test/validation/pktio/pktio_run diff --git a/platform/linux-generic/test/pktio/pktio_run_pcap b/platform/linux-generic/test/validation/pktio/pktio_run_pcap similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_pcap rename to platform/linux-generic/test/validation/pktio/pktio_run_pcap diff --git a/platform/linux-generic/test/pktio/pktio_run_tap b/platform/linux-generic/test/validation/pktio/pktio_run_tap similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_tap rename to platform/linux-generic/test/validation/pktio/pktio_run_tap diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run index 001d8c2..85ceaa4 100755 --- a/test/performance/odp_l2fwd_run +++ b/test/performance/odp_l2fwd_run @@ -37,11 +37,11 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env +elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation/pktio/pktio_env else echo "BUG: unable to find pktio_env!" - echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." + echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/validation/test." echo "ODP_PLATFORM=\"$ODP_PLATFORM\"" exit 1 fi