From patchwork Wed Feb 28 14:00:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 129994 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1565751edc; Wed, 28 Feb 2018 06:02:48 -0800 (PST) X-Google-Smtp-Source: AH8x225dqAtd8JQR8Rc1LBtNLjwkbg7xuFhytpsI8e2GPBJHkGQxv9wBpmifL9MIZPmS2fXk+Zjc X-Received: by 10.129.52.88 with SMTP id b85mr11986374ywa.189.1519826568128; Wed, 28 Feb 2018 06:02:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519826568; cv=none; d=google.com; s=arc-20160816; b=o2QLZfSTVUqv7/8atvNM8lZEfTGC2Dru2ZWh+1RTTGJAvIWeJUTNtj0BYbG8wuZiof 6CUCcDxlBZrIzF0bG7rj+H3j3U48YU8l47oTRf6iMHbOofzcxpZE4YVUJXWVYJ0P8/Br M6pZPDR+xSzfeWwAVes/HRY3Fw/FTAEnps8HvXluKTNSMuvhswAoMfjYE4XoRfT6aKQV FZP5Se96a1JIaQLeSWkqN/UXA4CmCntejL8WGNPdrC8eK6oYRprlhYByS1EJ9M/q4HVv vEgC4NmBu7C8MTMXhPBeXVbe/0POy4aoNV44SwLauuq2bWdZVLzSNx4sEepHbO41IP9Z EDuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=9bjbH5WC14LDxSFNN07EvoDNbz11vEKeNsgYIhYy13A=; b=XgYm1gm0HdcJH9wV8cD5CmYyfp5Bl0CDfNvCXJzxtbYz11927T6Ai/s7wl4ch94RM7 4FFwYjk38JIqSDaRVEQSLWCq1MQVgy9YCfkn6FQPUU1Uo3SoWlUQTnke028qGzVeDrB7 wjeORWkERHn/eeYAHg3u/oIg3lWDchD67sLKrb1iPJIJKL7o/w9goemb+F1YIMJevbNj weHoLGVRHiM9xqsCdvpvh7RWeJMgOvKCL8FpHRK7l7vHzpH7oc2WZEH5nhPU7UcJYAO9 uW/SfH6VDAy+knXd7ek8v36Zc+hV2/gP5J5ZRIKeyKLsJxAL4DjD4pYavZfsbI+FtvRr 5Fpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id g12-v6si280874ybh.131.2018.02.28.06.02.47; Wed, 28 Feb 2018 06:02:48 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id B4C046087B; Wed, 28 Feb 2018 14:02:47 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 06C52608B8; Wed, 28 Feb 2018 14:00:42 +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 93111616FC; Wed, 28 Feb 2018 14:00:28 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id E0398614E3 for ; Wed, 28 Feb 2018 14:00:20 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward101o.mail.yandex.net (Yandex) with ESMTP id B98EB1342D05 for ; Wed, 28 Feb 2018 17:00:16 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id q8AC768y1o-0GWCvu2q; Wed, 28 Feb 2018 17:00:16 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id K4Dn24Czbu-0F90xWLW; Wed, 28 Feb 2018 17:00:15 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 28 Feb 2018 17:00:12 +0300 Message-Id: <1519826413-28417-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519826413-28417-1-git-send-email-odpbot@yandex.ru> References: <1519826413-28417-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v12 1/2] example: generator: move script back to example 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Move script back to examples dir, so that platform other than linux-generic might be able to run this test/example, if they choose to implement null: PktIO type. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 496 (lumag:tests-fix-2) ** https://github.com/Linaro/odp/pull/496 ** Patch: https://github.com/Linaro/odp/pull/496.patch ** Base sha: f5e12df388352b27f09787028a0040afb28564f4 ** Merge commit sha: 15eadb7d8c8d6d10d976c1f7c67d847e9be8301a **/ example/generator/Makefile.am | 8 ++++ example/generator/generator_null_test.sh | 23 +++++++++++ platform/linux-generic/m4/configure.m4 | 2 - platform/linux-generic/test/Makefile.am | 4 -- platform/linux-generic/test/example/Makefile.am | 1 - .../test/example/generator/Makefile.am | 4 -- .../test/example/generator/generator_run.sh | 45 ---------------------- 7 files changed, 31 insertions(+), 56 deletions(-) create mode 100755 example/generator/generator_null_test.sh delete mode 100644 platform/linux-generic/test/example/Makefile.am delete mode 100644 platform/linux-generic/test/example/generator/Makefile.am delete mode 100755 platform/linux-generic/test/example/generator/generator_run.sh diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 7deeef406..112ebbf63 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,3 +3,11 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c + +TEST_EXTENSIONS = .sh + +if test_example +TESTS = generator_null_test.sh +TESTS_ENVIRONMENT += ODP_PLATFORM=$(with_platform) +endif +EXTRA_DIST = generator_null_test.sh diff --git a/example/generator/generator_null_test.sh b/example/generator/generator_null_test.sh new file mode 100755 index 000000000..a598ffd92 --- /dev/null +++ b/example/generator/generator_null_test.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +if [ -n "${ODP_PLATFORM}" -a "x${ODP_PLATFORM}" != "xlinux-generic" ] +then + echo "null pktio might be unsupported on this platform, skipping" + exit 77 +fi + +./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +exit 0 diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 935894b8c..7fa3652e2 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -19,8 +19,6 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/test/Makefile - platform/linux-generic/test/example/Makefile - platform/linux-generic/test/example/generator/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index e317ff736..99934099a 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -3,10 +3,6 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance -if test_example -SUBDIRS += example -endif - if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ diff --git a/platform/linux-generic/test/example/Makefile.am b/platform/linux-generic/test/example/Makefile.am deleted file mode 100644 index 41d287522..000000000 --- a/platform/linux-generic/test/example/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = generator diff --git a/platform/linux-generic/test/example/generator/Makefile.am b/platform/linux-generic/test/example/generator/Makefile.am deleted file mode 100644 index 3bdfdc69c..000000000 --- a/platform/linux-generic/test/example/generator/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -TESTS_ENVIRONMENT = EXAMPLE_DIR=${top_builddir}/example/generator - -TESTS = generator_run.sh -EXTRA_DIST = generator_run.sh diff --git a/platform/linux-generic/test/example/generator/generator_run.sh b/platform/linux-generic/test/example/generator/generator_run.sh deleted file mode 100755 index 85368d2eb..000000000 --- a/platform/linux-generic/test/example/generator/generator_run.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018-2018, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -# directory where platform test sources are, including scripts -TEST_SRC_DIR=$(dirname $0) - -# exit codes expected by automake for skipped tests -TEST_SKIPPED=77 - -# directories where binary can be found: -# -in the validation dir when running make check (intree or out of tree) -# -in the script directory, when running after 'make install', or -# -in the validation when running standalone intree. -# -in the current directory. -# running stand alone out of tree requires setting PATH -PATH="${EXAMPLE_DIR}/:$PATH" -PATH="`pwd`/example/generator/:$PATH" -PATH="$(dirname $0)/../../../../../example/generator:$PATH" -PATH=".:$PATH" - -bin_path=$(which odp_generator${EXEEXT}) -if [ -x "$bin_path" ] ; then - echo "running with odp_generator: $bin_path" -else - echo "cannot odp_generator: please set you PATH for it." - pwd - echo $PATH - exit 1 -fi - - -odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u -STATUS=$? - -if [ "$STATUS" -ne 0 ]; then - echo "Error: status was: $STATUS, expected 0" - exit 1 -fi - -exit 0