From patchwork Mon Mar 21 18:34:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 64134 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1578793lbc; Mon, 21 Mar 2016 11:36:02 -0700 (PDT) X-Received: by 10.140.232.211 with SMTP id d202mr44698921qhc.27.1458585362523; Mon, 21 Mar 2016 11:36:02 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 92si6978494qgz.58.2016.03.21.11.36.02; Mon, 21 Mar 2016 11:36:02 -0700 (PDT) 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 Received: by lists.linaro.org (Postfix, from userid 109) id 280CA6185A; Mon, 21 Mar 2016 18:36:02 +0000 (UTC) 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 5B07161883; Mon, 21 Mar 2016 18:34:55 +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 4B5786185D; Mon, 21 Mar 2016 18:34:48 +0000 (UTC) Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) by lists.linaro.org (Postfix) with ESMTPS id 512976184D for ; Mon, 21 Mar 2016 18:34:40 +0000 (UTC) Received: by mail-qk0-f173.google.com with SMTP id s5so82793397qkd.0 for ; Mon, 21 Mar 2016 11:34:40 -0700 (PDT) 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=ZQ/LsW+sNG/AIqp0tU9mFFIhwgAwDaQCOKiRn00iOu0=; b=J7n67CUCn4Fphre9WVevS31Qh1gOEc3aKm1WmrNSOqLSSwWWiGISM4Ncwu97oGTbb1 jcR97FyJyO1SQuA2v06hd1KKj/D3FowxdljQJ6bBwIYkzlYLM4oezyINklJSbHv7Dx1s o8uzvx3zPEKU+JcDqp2iNY6iBm/AUp+ZVWD0CTxYzKAoV8pCOb5M0HflRGjVPoyOyTHV R+gR/uZPluA8YHwTWY+wk7eEXUbgsUL5CK/BVj6wg9kLWagI8vuCBd2CddwuE82UZrJH DTT2TtYhexhIyQPdN/+MEzu/xr/wjS+E/kasPCBIMe0P/scMbRkCWt+a96HB6zUY9Aqz /vwQ== X-Gm-Message-State: AD7BkJJ5DBSzrFG00OajIyu1ddPl3Z68HHv+hhbAgjFOful6m3gi3/dgnz0v6TltBjT4BiqxgvM= X-Received: by 10.55.201.219 with SMTP id m88mr42230128qkl.41.1458585279796; Mon, 21 Mar 2016 11:34:39 -0700 (PDT) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id b103sm12789814qge.2.2016.03.21.11.34.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Mar 2016 11:34:39 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 21 Mar 2016 14:34:04 -0400 Message-Id: <1458585245-31429-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458585245-31429-1-git-send-email-mike.holmes@linaro.org> References: <1458585245-31429-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 1/2] linux-generic: test: Mimic the test validation directory structure 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 under platform also. Signed-off-by: Mike Holmes --- platform/linux-generic/m4/configure.m4 | 3 +- platform/linux-generic/test/.gitignore | 1 - platform/linux-generic/test/Makefile.am | 63 +-------------------- platform/linux-generic/test/validation/.gitignore | 1 + platform/linux-generic/test/validation/Makefile.am | 64 ++++++++++++++++++++++ .../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_netmap | 0 .../test/{ => validation}/pktio/pktio_run_pcap | 0 .../test/{ => validation}/pktio/pktio_run_tap | 0 test/performance/odp_l2fwd_run | 6 +- 13 files changed, 71 insertions(+), 67 deletions(-) create mode 100644 platform/linux-generic/test/validation/.gitignore create mode 100644 platform/linux-generic/test/validation/Makefile.am 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_netmap (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 589722f..8b09a45 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -24,4 +24,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/.gitignore b/platform/linux-generic/test/.gitignore index 5dabf91..7e563b8 100644 --- a/platform/linux-generic/test/.gitignore +++ b/platform/linux-generic/test/.gitignore @@ -1,3 +1,2 @@ *.log *.trs -tests-validation.env diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 56e3d43..312d18e 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,62 +1 @@ -include $(top_srcdir)/test/Makefile.inc -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/atomic/atomic_main$(EXEEXT) \ - ${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \ - ${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/lock/lock_main$(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/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/traffic_mngr/traffic_mngr_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 -endif -if netmap_support -TESTS += pktio/pktio_run_netmap -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 +SUBDIRS = validation diff --git a/platform/linux-generic/test/validation/.gitignore b/platform/linux-generic/test/validation/.gitignore new file mode 100644 index 0000000..acc4880 --- /dev/null +++ b/platform/linux-generic/test/validation/.gitignore @@ -0,0 +1 @@ +tests-validation.env diff --git a/platform/linux-generic/test/validation/Makefile.am b/platform/linux-generic/test/validation/Makefile.am new file mode 100644 index 0000000..165a6bd --- /dev/null +++ b/platform/linux-generic/test/validation/Makefile.am @@ -0,0 +1,64 @@ +include $(top_srcdir)/test/Makefile.inc +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/atomic/atomic_main$(EXEEXT) \ + ${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \ + ${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/lock/lock_main$(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/thread/thread_main$(EXEEXT) \ + ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ + ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ + ${top_builddir}/test/validation/traffic_mngr/traffic_mngr_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 +endif +endif + +dist_check_SCRIPTS = ../run-test tests-validation.env $(LOG_COMPILER) + +test_SCRIPTS = $(dist_check_SCRIPTS) + +.PHONY: tests-validation.env +tests-validation.env: + @echo "TESTS=\"$(TESTS)\"" > $@ + @echo "$(TESTS_ENVIRONMENT)" >> $@ + @echo "LOG_COMPILER=\"$(LOG_COMPILER)\"" >> $@ + +if test_installdir +installcheck-local: + echo "trying $(DESTDIR)/$(testdir)/run-test" + $(DESTDIR)/$(testdir)/run-test +endif + +clean-local: + rm -rf $(builddir)/tests-validation.env + +#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_netmap b/platform/linux-generic/test/validation/pktio/pktio_run_netmap similarity index 100% rename from platform/linux-generic/test/pktio/pktio_run_netmap rename to platform/linux-generic/test/validation/pktio/pktio_run_netmap 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 cab97a8..8dfb415 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