From patchwork Wed May 11 01:07:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 67483 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2411821qge; Tue, 10 May 2016 18:08:00 -0700 (PDT) X-Received: by 10.140.155.19 with SMTP id b19mr647809qhb.14.1462928880616; Tue, 10 May 2016 18:08:00 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v11si3350169qkl.47.2016.05.10.18.08.00; Tue, 10 May 2016 18:08:00 -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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 492406157C; Wed, 11 May 2016 01:08:00 +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_H2, 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 5045E6158A; Wed, 11 May 2016 01:07:34 +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 90D2A611FB; Wed, 11 May 2016 01:07:31 +0000 (UTC) Received: from mail-qg0-f44.google.com (mail-qg0-f44.google.com [209.85.192.44]) by lists.linaro.org (Postfix) with ESMTPS id B15E46157C for ; Wed, 11 May 2016 01:07:30 +0000 (UTC) Received: by mail-qg0-f44.google.com with SMTP id 90so16478804qgz.1 for ; Tue, 10 May 2016 18:07:30 -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=DoerTAj6yhjdz9a+huwFn1Z7Zj2rtD8bKSTDcCCbg+I=; b=j/84g75F93UmpSAysOXXhFbAaltyP6mMooFPMgpFyV2FWvJ59CTW+Umq4dNZx5FP3E 7wNH2ewKos05BE/STf7bKU1qr8Ao45KfSQgErPRXxBtFvq2/Dkm9xSueegzvXLOxEz65 ez7JMkS7f71d03dF618GwyQeqgzzIIIaekTJmVIOire//QZi9YvpW/WOtVloH5XEaLT2 +KZoGQ1qj9S3L4JbijJdphrq3tiF/mmoUpPi1pLpL/EzuMKD0GSKlAKtAYjCFiRVDVE7 klSv2V2q/UrvbWuwTmzEViCUW47iGIlJR7EmAvKTQHe3o3REGD6pI/BwjLEmMnfOFbuL 2Kbw== X-Gm-Message-State: AOPr4FWJl+zKvZTYF+A9+gNKaWw+Jp01JOKlzTeDAu4x2glMgBSaAE7I1gE8xFRcItRtuFk2CaI= X-Received: by 10.140.142.136 with SMTP id 130mr632502qho.64.1462928850453; Tue, 10 May 2016 18:07:30 -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 90sm2269445qgh.28.2016.05.10.18.07.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 18:07:30 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Tue, 10 May 2016 21:07:11 -0400 Message-Id: <1462928831-21055-2-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462928831-21055-1-git-send-email-mike.holmes@linaro.org> References: <1462928831-21055-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/2] linux-generic: test: move pktio_env to common dir 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" pktio_env is used more widely than by just pktio testing. Move it to a more central location removing the need for a special case for performance tests where the pktio dir has to be traversed during build even when the directory is not used. Signed-off-by: Mike Holmes --- platform/linux-generic/test/Makefile.am | 7 +------ platform/linux-generic/test/pktio/Makefile.am | 3 +-- platform/linux-generic/test/pktio/pktio_run | 4 ++-- platform/linux-generic/test/{pktio => }/pktio_env | 0 test/performance/odp_l2fwd_run | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) rename platform/linux-generic/test/{pktio => }/pktio_env (100%) diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 05998e3..1696314 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -52,7 +52,7 @@ TESTS += pktio/pktio_run_dpdk endif endif -dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER) +dist_check_SCRIPTS = pktio_env run-test tests-validation.env $(LOG_COMPILER) test_SCRIPTS = $(dist_check_SCRIPTS) @@ -65,8 +65,3 @@ 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/Makefile.am b/platform/linux-generic/test/pktio/Makefile.am index 3dcc1ee..0fed964 100644 --- a/platform/linux-generic/test/pktio/Makefile.am +++ b/platform/linux-generic/test/pktio/Makefile.am @@ -1,5 +1,4 @@ -dist_check_SCRIPTS = pktio_env \ - pktio_run \ +dist_check_SCRIPTS = pktio_run \ pktio_run_tap if HAVE_PCAP diff --git a/platform/linux-generic/test/pktio/pktio_run b/platform/linux-generic/test/pktio/pktio_run index 774a616..82d8642 100755 --- a/platform/linux-generic/test/pktio/pktio_run +++ b/platform/linux-generic/test/pktio/pktio_run @@ -36,8 +36,8 @@ PKTIO_ENV="$(which pktio_env)" if [ -f "${PKTIO_ENV}" ]; then . ${PKTIO_ENV} -elif [ -f ${TEST_SRC_DIR}/pktio_env ]; then - . ${TEST_SRC_DIR}/pktio_env +elif [ -f ${TEST_SRC_DIR}/../pktio_env ]; then + . ${TEST_SRC_DIR}/../pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current path or in platform/\$ODP_PLATFORM/test" diff --git a/platform/linux-generic/test/pktio/pktio_env b/platform/linux-generic/test/pktio_env similarity index 100% rename from platform/linux-generic/test/pktio/pktio_env rename to platform/linux-generic/test/pktio_env diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run index cab97a8..2aa9814 100755 --- a/test/performance/odp_l2fwd_run +++ b/test/performance/odp_l2fwd_run @@ -37,8 +37,8 @@ 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/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/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."