From patchwork Thu Feb 22 11:00:02 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: 129198 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp470162lja; Thu, 22 Feb 2018 03:06:26 -0800 (PST) X-Google-Smtp-Source: AH8x227w6mm7HstD8RuzALlETNKMEtcESV0GaEq2UVOKINLO3BKfpgm3ad94D1lsyVbXAVGiT6ZZ X-Received: by 10.55.42.132 with SMTP id q4mr9523301qkq.77.1519297585904; Thu, 22 Feb 2018 03:06:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297585; cv=none; d=google.com; s=arc-20160816; b=mOBomS/5ZM9QjJuQQY4fsqT8eyyB5lP4xInAiFk9S/Vo6VjIuXYiVrBlGyYBigYkZq 3kt9wmaj/z4T9nkq/mppMo5v3t/u3nZ5WgbZ4JN1I9ZySvFfkEsuq8IqGd6+mmfOlQXH S5x89BHSEyh8UekLjJdsALb4/Y1lmq4xXSHi5qJZijQ8lwurj6l7V2kVTjWGRvCfUqd/ l16lf+lOVTkteAA3P97bm5P42w/j5t3V8HrpvuJy6QzN/V6dAWyHJ5kH3ptofaCJfmGv 0L13SUxjDUc108G2BXkcgE3YDgpYZ9voDcecBMXEdTG0MLIkgJUq0xhxVLA6E8mOq9qE +SMQ== 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=OqP2Prc1yK/z7YIbewf7SzPB//elm8G8DfWoyjgEz5U=; b=AsRJqdO+WKHwWltTkm2FnncN3aYZ8U+tdooVSPFom/IpXw5oJl6Im31ZF+isfZ5nMT aJBxEBU6QYCfet/fJd9b/AXXI6QdMQRi3si52Qvg7KYvuh0jA7qp8XxcFyjPBVr4v+DA kY9Pv5rCi/u8P5wluDCHx5HU/9EOzFxuwiEO6A50FONoHIUTDpKjlNqfIDbfSybUV9wm pCUoYRyL1GRSQNXKqz6uVgUIH9owBE9hjo+O0BK+HyOk8vDqZ9msPlhj5pJBA/lELzmG 5xq8UufWUM/IAvNeCHOTZ8mD3j3DxkEJA6gGJo7wKRM+I9y6Sh8gNFqIXt2AIPr3pAU2 atqA== 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 m7si783187qtc.28.2018.02.22.03.06.25; Thu, 22 Feb 2018 03:06:25 -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 8BE2361700; Thu, 22 Feb 2018 11:06:25 +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 72DFB617D1; Thu, 22 Feb 2018 11:04:08 +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 CFA58617D1; Thu, 22 Feb 2018 11:03:59 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id 8B762608E4 for ; Thu, 22 Feb 2018 11:01:36 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 9576F5882CDB for ; Thu, 22 Feb 2018 14:00:11 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dOBMT4Bplq-0BE8L8cM; Thu, 22 Feb 2018 14:00:11 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0AYOH43n; Thu, 22 Feb 2018 14:00:10 +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: Thu, 22 Feb 2018 14:00:02 +0300 Message-Id: <1519297209-16246-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 1/8] Revert "example: generator move to platform tests" 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 This reverts commit 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb. Don't make platform tests depend on examples. 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ example/generator/Makefile.am | 5 +++ example/generator/generator_run.sh | 17 ++++++++ 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, 22 insertions(+), 56 deletions(-) create mode 100755 example/generator/generator_run.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..63f4ae608 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,3 +3,8 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c + +if test_example +TESTS = generator_run.sh +endif +EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh new file mode 100755 index 000000000..2d741a8d1 --- /dev/null +++ b/example/generator/generator_run.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +./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 3e7fabfe7..000000000 --- a/platform/linux-generic/test/example/generator/generator_run.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 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 From patchwork Thu Feb 22 11:00:03 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: 129200 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp477077lja; Thu, 22 Feb 2018 03:14:20 -0800 (PST) X-Google-Smtp-Source: AH8x227I4PU7B2NDAFupi4Xb28YCVI2S/UjGmyIsU1n/mIj88dS6ggGqZNykCqou6vv9a9XYSur1 X-Received: by 10.237.45.226 with SMTP id i89mr10077309qtd.246.1519298059900; Thu, 22 Feb 2018 03:14:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519298059; cv=none; d=google.com; s=arc-20160816; b=z/Uj0B8/k+5G2E/XhYybqSgbU1zG2pIVrOAJxx/+2jRqgmcKJQglRU+2z7j0aXlMgj hEtXy7bXiM6LW9L/Tupq4MAiEHuNn+zy/0pDwy/Tn7SlApVgoSLcbiF0qdbvlTDWW5T0 3csV6rakIGwFFAHRrfqwVC6zx3VXfTXuC1NTs0lKqxArM3XsY5uWaiqFAjEaHprI6770 u+H4cpMEaKhjf+FAiq9OxK/mypR5KsH6AVMIGhAnJtkJNhe4Csd2WPxpvhD9Uka45MVq ROfceXqZ4iDBYU+RpcyJXc/2OtSpKHrnady4JO7hn/+YjW9HS8aOvLK3SuyztCg5Lhb/ xzew== 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=qXwO2N3Rd20SzcAYXleFSarJHOQ+nGU0k/rZboMOBtM=; b=SUEYXjfuw0AmTkYudzPUAoi8UWtk75nqb7K/8lm8lOl0NT0A3GhoO5tyY0Zkv5YrsD mtV8CQroczrXaFFspa+cS24D0v88Y0N4FZGh5xq78tqrRB3J0pv2ydiQVBlIzMpe0wAk Cq2LDfczRbPLCFJkBR+sLPcYt/94wTIN/5XcFMscM3BuygRxeKo9rfRXlv7CptsHJiEU df2ZH1LL6eUkqvpaDH3D2Uan4wnm9FESGQZ91XNks4Fh36MX+0borBiuMMIr/OtxCKZt fc/55Qvx6w6WlxyOAKMC1D2iSUlMXKnX7P2EL/88MYld4EjVEXQSWTAXeJTWypmILNTq vC3A== 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 r65si1334056qkd.367.2018.02.22.03.14.19; Thu, 22 Feb 2018 03:14:19 -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 7C978627E3; Thu, 22 Feb 2018 11:14:19 +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 52AAD61783; Thu, 22 Feb 2018 11:05:21 +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 37A8E61761; Thu, 22 Feb 2018 11:05:13 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id B17B5616FA for ; Thu, 22 Feb 2018 11:02:05 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 9C9F2408492C for ; Thu, 22 Feb 2018 14:00:12 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YT9wjorrtm-0CumBXML; Thu, 22 Feb 2018 14:00:12 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0BYqvkqh; Thu, 22 Feb 2018 14:00:11 +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: Thu, 22 Feb 2018 14:00:03 +0300 Message-Id: <1519297209-16246-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 2/8] example: generator: skip execution on unsupported platforms 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 null: pktio class is not a part of ABI, so it might be unsupported on some of platforms. Add condition guarding execution of this example only on supported platforms. 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ example/generator/Makefile.am | 3 +++ example/generator/generator_run.sh | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 63f4ae608..cd2383187 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -4,7 +4,10 @@ bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c +TEST_EXTENSIONS = .sh + if test_example TESTS = generator_run.sh +TESTS_ENVIRONMENT += ODP_PLATFORM=$(with_platform) endif EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh index 2d741a8d1..3d8ac0e98 100755 --- a/example/generator/generator_run.sh +++ b/example/generator/generator_run.sh @@ -6,6 +6,12 @@ # SPDX-License-Identifier: BSD-3-Clause # +if [ -n "${ODP_PLATFORM}" -a "x${ODP_PLATFORM}" != "xlinux-generic" ] +then + echo "Skipping test on probably unsupported platform" + exit 77 +fi + ./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u STATUS=$? From patchwork Thu Feb 22 11:00:04 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: 129194 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp464228lja; Thu, 22 Feb 2018 03:00:35 -0800 (PST) X-Google-Smtp-Source: AH8x226WLE0fpWKmSS5LbVg92xpscPFd7c3umLZxDLTq+2ABSM+5w5YkccRLxstWVPHXD8Qfx1Nj X-Received: by 10.55.101.146 with SMTP id z140mr10097807qkb.178.1519297235626; Thu, 22 Feb 2018 03:00:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297235; cv=none; d=google.com; s=arc-20160816; b=QFAWiDQn6oCRDdrOqVJUo/OuKwgsOH7XDcHcPMkJ7LkAz3rJdeR2XCiiJngFQDg2L5 tI4hv6FUO7tvpxslf4OhXzU7QkUJxEFg6PRSsCFFLyadA1EAH43bCPHiLANMUagGHm/w +RDFT9YYBqDsvjEjouHFc6K7i6eF0hocSaJFqHpHwy2rvYxMAMHo7txqYE7fGhRzxOZc cdR8x8f+cCdnM6lj1G6gsXnmGIBtS5qNhJm240sY9eWBoatN282bks4TFCtRVhj2Jc1A GflcyLJq8+6WuJZuKGJW+0MpqFcYe3x9KyDYZTw8boxnS6dYadcZ0X7nnp0aLBS+I0MC 6gRg== 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=IoCFBNtt14YKOaAWNF/XIsrQypJ7BeNGUOD+oVYIwdM=; b=E+UctwOGy6sf2hykUR+hQB3sRptueJ1W+RNlmvAmCGcK1cRP6qxvHetLyUw4mHuePK QHtMAUJYssJkQuzMMyYgv09HGKZRWSWCmLfEmp4op3CyjLnqzYZ12U6HxzfL1xO1BEsA CsuAnBUTz0wE6H3qf0rSX752ZLoI8cyD34lKJl7xuGmZM4HnNFWneyoC8ERV7/oyqI0k 5ijx23CnvYmBVa/mWq98UL4wc/GjJhxLxB91ah6dVFayzKbw02A/rcczj1OUonqMtZ6r hwnxUyNjwcVztdhz8p5wvlKVrK1HShRDdEnPP1SxJ8CP96sQ0/sF9lhapbc/X4k04D6q /R6g== 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 i33si1303869qta.255.2018.02.22.03.00.35; Thu, 22 Feb 2018 03:00:35 -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 ED98A61511; Thu, 22 Feb 2018 11:00:34 +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 74DD361746; Thu, 22 Feb 2018 11:00:27 +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 1C6546174A; Thu, 22 Feb 2018 11:00:16 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 0EBC161746 for ; Thu, 22 Feb 2018 11:00:15 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 8FC034445D2A for ; Thu, 22 Feb 2018 14:00:13 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id W9Mtc5n0dS-0DTmIwEs; Thu, 22 Feb 2018 14:00:13 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0CY0xDY5; Thu, 22 Feb 2018 14:00:12 +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: Thu, 22 Feb 2018 14:00:04 +0300 Message-Id: <1519297209-16246-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 3/8] build: change order of subdirectories 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 Descend into examples after building/running tests. It is quite logical that first we build validation & performance tests, then we build platform tests, helper tests and only after that descend into examples. 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index dab8ca8c6..1e1988451 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,11 +12,11 @@ SUBDIRS = \ include \ $(PLATFORM_DIR) \ helper \ - helper/test \ doc \ - example . \ test \ - $(PLATFORM_TEST_DIR) + $(PLATFORM_TEST_DIR) \ + helper/test \ + example @DX_RULES@ From patchwork Thu Feb 22 11:00:05 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: 129195 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp465930lja; Thu, 22 Feb 2018 03:02:01 -0800 (PST) X-Google-Smtp-Source: AH8x227Eas9SXkoL04+3K2Lw5IYsAqUV173b60BrQ12sdNHGhr0jqcKJFMLTJ/Bsrv0H6CLeYSQq X-Received: by 10.200.12.2 with SMTP id k2mr10149979qti.201.1519297315683; Thu, 22 Feb 2018 03:01:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297315; cv=none; d=google.com; s=arc-20160816; b=W7AO3L4EdNwJj7FUyBr5oGdx4wokDjGIuGefO1jDMfRDj2jf2sGKvD0PEF4OBf9S8P UWtQYRTH3423Srr3Bhq9CQpec/K8Xsp4E+l1GQUiLZJ70YtXufXgxTjUMV4uNGWY9NS7 Mb/tyisrE74eYNU/5J7RVzfylJzm/FIQUDW5TkPH2SBI8L6Q/o0BWq1LdW4X46G5eTiM dRn83T91/wDLVq9TkekF9e/C8ana0RVEZGfwaXVs7tfX4uNrLlK7bsz6JbS6I2H0tcsB kGjYNZgB66MGMM75NlCBQ9/9RoKs0b4mla1zpC9VndKIiXIiWWMTTLAMimzkGs1CS5zo pCxg== 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=nvagOo4Y/TGwXmNW3z0Oq+kNxViyWLqtTyYNBcwLk4c=; b=q3SzJWFXtQWNmMNpQU325rkAlfQOb05Ok18fuiaaiXyNbJACl+eCXfWHvLg7F/vawR tq4XFtyNyPLFjGBlSx53pldnX7NVzOiRx2yhbv9fG+B7LvxgmbNxkHOQpqua72wbtN1H +pFDvuNOosbeM4GQofxjPHKRKCm8SN7JrVpJQnoEfcLawtE2WG929+H/ACzSzFuQY8MO R8Bo+oK0Hwz5QoA7ru91GbgjVZ0AqHNu7o3XrtMHl/1117dtG/rHV0LMZv41BVCV/CNf dOIYu1JY5tBhwV6gfHdUpuFo6bI4tMTGS4BrPwQibFord53Gpde6Fqx0OKROSXr+X2xs EhCw== 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 y10si1212002qti.458.2018.02.22.03.01.55; Thu, 22 Feb 2018 03:01:55 -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 ED93261763; Thu, 22 Feb 2018 11:01:54 +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 5238861502; Thu, 22 Feb 2018 11:00:39 +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 1FDCA61748; Thu, 22 Feb 2018 11:00:19 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id B9E2061746 for ; Thu, 22 Feb 2018 11:00:16 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 6294A5D853F8 for ; Thu, 22 Feb 2018 14:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3Esh2tEJMK-0EK8HU2d; Thu, 22 Feb 2018 14:00:15 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0DYqGPMA; Thu, 22 Feb 2018 14:00:13 +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: Thu, 22 Feb 2018 14:00:05 +0300 Message-Id: <1519297209-16246-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 4/8] validation: init: remove "library" file 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 Split init.c/init.h files into individual tests, simplifying setup. 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ test/validation/api/init/Makefile.am | 6 +- test/validation/api/init/init.c | 190 ----------------------------- test/validation/api/init/init.h | 32 ----- test/validation/api/init/init_main_abort.c | 55 ++++++++- test/validation/api/init/init_main_log.c | 76 +++++++++++- test/validation/api/init/init_main_ok.c | 45 ++++++- 6 files changed, 173 insertions(+), 231 deletions(-) delete mode 100644 test/validation/api/init/init.c delete mode 100644 test/validation/api/init/init.h diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 2d0661431..5af2e00bc 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -4,6 +4,6 @@ include ../Makefile.inc # following each other: therefore 3 separate binaries are # created, each containing its ODP init test. test_PROGRAMS = init_main_abort init_main_log init_main_ok -init_main_abort_SOURCES = init_main_abort.c init.c init.h -init_main_log_SOURCES = init_main_log.c init.c init.h -init_main_ok_SOURCES = init_main_ok.c init.c init.h +init_main_abort_SOURCES = init_main_abort.c +init_main_log_SOURCES = init_main_log.c +init_main_ok_SOURCES = init_main_ok.c diff --git a/test/validation/api/init/init.c b/test/validation/api/init/init.c deleted file mode 100644 index 3dc40ea5f..000000000 --- a/test/validation/api/init/init.c +++ /dev/null @@ -1,190 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include -#include -#include -#include -#include "init.h" - -/* flag set when the replacement logging function is used */ -int replacement_logging_used; - -/* replacement abort function: */ -static void odp_init_abort(void) ODP_NORETURN; - -/* replacement log function: */ -ODP_PRINTF_FORMAT(2, 3) -static int odp_init_log(odp_log_level_t level, const char *fmt, ...); - -/* test ODP global init, with alternate abort function */ -void init_test_odp_init_global_replace_abort(void) -{ - int status; - odp_init_t init_data; - odp_instance_t instance; - - odp_init_param_init(&init_data); - init_data.abort_fn = &odp_init_abort; - - status = odp_init_global(&instance, &init_data, NULL); - CU_ASSERT_FATAL(status == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_abort[] = { - ODP_TEST_INFO(init_test_odp_init_global_replace_abort), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_abort[] = { - {"Init", NULL, NULL, init_suite_abort}, - ODP_SUITE_INFO_NULL, -}; - -static void odp_init_abort(void) -{ - abort(); -} - -int init_main_abort(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* run the tests: */ - ret = odp_cunit_register(init_suites_abort); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} - -/* test ODP global init, with alternate log function */ -void init_test_odp_init_global_replace_log(void) -{ - int status; - odp_init_t init_data; - odp_instance_t instance; - - odp_init_param_init(&init_data); - init_data.log_fn = &odp_init_log; - - replacement_logging_used = 0; - - status = odp_init_global(&instance, &init_data, NULL); - CU_ASSERT_FATAL(status == 0); - - CU_ASSERT_TRUE(replacement_logging_used || ODP_DEBUG_PRINT == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_log[] = { - ODP_TEST_INFO(init_test_odp_init_global_replace_log), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_log[] = { - {"Init", NULL, NULL, init_suite_log}, - ODP_SUITE_INFO_NULL, -}; - -static int odp_init_log(odp_log_level_t level __attribute__((unused)), - const char *fmt, ...) -{ - va_list args; - int r; - - /* just set a flag to be sure the replacement fn was used */ - replacement_logging_used = 1; - - va_start(args, fmt); - r = vfprintf(stderr, fmt, args); - va_end(args); - - return r; -} - -int init_main_log(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* register the tests: */ - ret = odp_cunit_register(init_suites_log); - - /* run the tests: */ - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} - -/* test normal ODP global init */ -void init_test_odp_init_global(void) -{ - int status; - odp_instance_t instance; - - status = odp_init_global(&instance, NULL, NULL); - CU_ASSERT_FATAL(status == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_ok[] = { - ODP_TEST_INFO(init_test_odp_init_global), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_ok[] = { - {"Init", NULL, NULL, init_suite_ok}, - ODP_SUITE_INFO_NULL, -}; - -int init_main_ok(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* register the tests: */ - ret = odp_cunit_register(init_suites_ok); - - /* run the tests: */ - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/api/init/init.h b/test/validation/api/init/init.h deleted file mode 100644 index cad9cf988..000000000 --- a/test/validation/api/init/init.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_INIT_H_ -#define _ODP_TEST_INIT_H_ - -#include - -/* test functions: */ -void init_test_odp_init_global_replace_abort(void); -void init_test_odp_init_global_replace_log(void); -void init_test_odp_init_global(void); - -/* test arrays: */ -extern odp_testinfo_t init_suite_abort[]; -extern odp_testinfo_t init_suite_log[]; -extern odp_testinfo_t init_suite_ok[]; - -/* test registry: */ -extern odp_suiteinfo_t init_suites_abort[]; -extern odp_suiteinfo_t init_suites_log[]; -extern odp_suiteinfo_t init_suites_ok[]; - -/* main test program: */ -int init_main_abort(int argc, char *argv[]); -int init_main_log(int argc, char *argv[]); -int init_main_ok(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c index 1b043154f..e00d3e089 100644 --- a/test/validation/api/init/init_main_abort.c +++ b/test/validation/api/init/init_main_abort.c @@ -6,9 +6,60 @@ #include "config.h" -#include "init.h" +#include +#include +#include + +/* replacement abort function: */ +static void ODP_NORETURN odp_init_abort(void) +{ + abort(); +} + +/* test ODP global init, with alternate abort function */ +static void init_test_odp_init_global_replace_abort(void) +{ + int status; + odp_init_t init_data; + odp_instance_t instance; + + odp_init_param_init(&init_data); + init_data.abort_fn = &odp_init_abort; + + status = odp_init_global(&instance, &init_data, NULL); + CU_ASSERT_FATAL(status == 0); + + status = odp_term_global(instance); + CU_ASSERT(status == 0); +} + +odp_testinfo_t init_suite_abort[] = { + ODP_TEST_INFO(init_test_odp_init_global_replace_abort), + ODP_TEST_INFO_NULL, +}; + +odp_suiteinfo_t init_suites_abort[] = { + {"Init", NULL, NULL, init_suite_abort}, + ODP_SUITE_INFO_NULL, +}; int main(int argc, char *argv[]) { - return init_main_abort(argc, argv); + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + /* prevent default ODP init: */ + odp_cunit_register_global_init(NULL); + odp_cunit_register_global_term(NULL); + + /* run the tests: */ + ret = odp_cunit_register(init_suites_abort); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; } diff --git a/test/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c index d5d1ba6d3..2c6f1f114 100644 --- a/test/validation/api/init/init_main_log.c +++ b/test/validation/api/init/init_main_log.c @@ -6,9 +6,81 @@ #include "config.h" -#include "init.h" +#include +#include +#include + +/* flag set when the replacement logging function is used */ +int replacement_logging_used; + +/* replacement log function: */ +ODP_PRINTF_FORMAT(2, 3) +static int odp_init_log(odp_log_level_t level __attribute__((unused)), + const char *fmt, ...) +{ + va_list args; + int r; + + /* just set a flag to be sure the replacement fn was used */ + replacement_logging_used = 1; + + va_start(args, fmt); + r = vfprintf(stderr, fmt, args); + va_end(args); + + return r; +} + + +/* test ODP global init, with alternate log function */ +static void init_test_odp_init_global_replace_log(void) +{ + int status; + odp_init_t init_data; + odp_instance_t instance; + + odp_init_param_init(&init_data); + init_data.log_fn = &odp_init_log; + + replacement_logging_used = 0; + + status = odp_init_global(&instance, &init_data, NULL); + CU_ASSERT_FATAL(status == 0); + + CU_ASSERT_TRUE(replacement_logging_used || ODP_DEBUG_PRINT == 0); + + status = odp_term_global(instance); + CU_ASSERT(status == 0); +} + +odp_testinfo_t init_suite_log[] = { + ODP_TEST_INFO(init_test_odp_init_global_replace_log), + ODP_TEST_INFO_NULL, +}; + +odp_suiteinfo_t init_suites_log[] = { + {"Init", NULL, NULL, init_suite_log}, + ODP_SUITE_INFO_NULL, +}; int main(int argc, char *argv[]) { - return init_main_log(argc, argv); + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + /* prevent default ODP init: */ + odp_cunit_register_global_init(NULL); + odp_cunit_register_global_term(NULL); + + /* register the tests: */ + ret = odp_cunit_register(init_suites_log); + + /* run the tests: */ + if (ret == 0) + ret = odp_cunit_run(); + + return ret; } diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c index bb205f6df..52df15694 100644 --- a/test/validation/api/init/init_main_ok.c +++ b/test/validation/api/init/init_main_ok.c @@ -6,9 +6,50 @@ #include "config.h" -#include "init.h" +#include +#include + +/* test normal ODP global init */ +static void init_test_odp_init_global(void) +{ + int status; + odp_instance_t instance; + + status = odp_init_global(&instance, NULL, NULL); + CU_ASSERT_FATAL(status == 0); + + status = odp_term_global(instance); + CU_ASSERT(status == 0); +} + +odp_testinfo_t init_suite_ok[] = { + ODP_TEST_INFO(init_test_odp_init_global), + ODP_TEST_INFO_NULL, +}; + +odp_suiteinfo_t init_suites_ok[] = { + {"Init", NULL, NULL, init_suite_ok}, + ODP_SUITE_INFO_NULL, +}; int main(int argc, char *argv[]) { - return init_main_ok(argc, argv); + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + /* prevent default ODP init: */ + odp_cunit_register_global_init(NULL); + odp_cunit_register_global_term(NULL); + + /* register the tests: */ + ret = odp_cunit_register(init_suites_ok); + + /* run the tests: */ + if (ret == 0) + ret = odp_cunit_run(); + + return ret; } From patchwork Thu Feb 22 11:00:06 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: 129199 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp471699lja; Thu, 22 Feb 2018 03:08:02 -0800 (PST) X-Google-Smtp-Source: AH8x227gcaT1reP0G8TiwD4gCjbUUVeQty9XRdJWiSQn5RjTtnlQhjZlIkNgMaOIG+KlkjK7u0E+ X-Received: by 10.55.152.196 with SMTP id a187mr9715217qke.120.1519297681818; Thu, 22 Feb 2018 03:08:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297681; cv=none; d=google.com; s=arc-20160816; b=te134+XLeVdvIjnsCImMXh8zmDynUIZpyolxiTUkgcV9XTNCbEidW6LawJo6awpCak gbBVVUQlqr9vHP1z/yn0fwuWucVL6PfFsqTVmBcwQHXudPjptKUQPlp/yOKm5Z9XfgJ0 YrGxjYsbUYsVbVAusNo29BOH0lR42eDw4O1ALH98St8THTvSyOK85F42srvg19sesoA7 lgXkGk1Abk2BAO7Pucm3v2OzwsPuiUBVrxaFfzyW5AYsTUo0RhyM83rRj+oK7UUVH2F2 4YiJN7Dhgft1hkm33kQzhScd+mUcwIyijpoToTuanSb4t6XMcHx2Px3bLSViaNSNLTAW pOYQ== 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=vaHZzcttqV7AqxspC6a6y3hUSC/vYErvDM9iLl0LPug=; b=P36Q7CT3Yb6w3ytmZzE8oph1rFOcSwOHimb9WIHVUlWOlMAhh2aq0tm0cxOAn3HVsV aepGHHNAgheEswX0bx2IvwMeI6++VuVfCQN6SOi7hpdjaGfRQnXAjk7C5aieL/a6K9rq u1jdSCE7aqcXFN1jjqFRY1bnKyb3uLMW1kQyM5b9DW5fyASogP2A/bZvNxrDgFjWLQrr UZRmJUQLXIt7uTl8nWvK2D5lxlxexIZBgsJCdOl0CEhqNnCux1Io+mgwCTs+Xk4iMt6X /DMUOUnJMZEbVvIg8/zbGj7L/4zqwS2zw8of+aTA08g8Ox6GobwNL/BNVbQh6pF9ryuY z9fw== 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 r28si8261630qte.81.2018.02.22.03.08.01; Thu, 22 Feb 2018 03:08:01 -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 4C9586278D; Thu, 22 Feb 2018 11:08:01 +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 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 21A36617FD; Thu, 22 Feb 2018 11:04:38 +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 28CDE616F9; Thu, 22 Feb 2018 11:04:20 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 3F070616F9 for ; Thu, 22 Feb 2018 11:01:44 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 2BE7F18335A for ; Thu, 22 Feb 2018 14:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cruUe9rsPq-0H2WIkdP; Thu, 22 Feb 2018 14:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0FY8w06u; Thu, 22 Feb 2018 14: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: Thu, 22 Feb 2018 14:00:06 +0300 Message-Id: <1519297209-16246-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 5/8] validation: move most of tests to common 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 There is little benefit from keeping each test in it's own subdirectory. It just slows down build process. Move most of the tests to just api/ diretory to be built in parallel. 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ .../test/validation/api/pktio/.gitignore | 2 - test/m4/configure.m4 | 24 --- test/validation/api/.gitignore | 29 ++++ test/validation/api/Makefile.am | 175 ++++++++++++++------- test/validation/api/{atomic => }/atomic.c | 0 test/validation/api/atomic/.gitignore | 1 - test/validation/api/atomic/Makefile.am | 4 - test/validation/api/{barrier => }/barrier.c | 0 test/validation/api/barrier/.gitignore | 1 - test/validation/api/barrier/Makefile.am | 4 - test/validation/api/{buffer => }/buffer.c | 0 test/validation/api/buffer/.gitignore | 1 - test/validation/api/buffer/Makefile.am | 4 - test/validation/api/{chksum => }/chksum.c | 0 test/validation/api/chksum/.gitignore | 1 - test/validation/api/chksum/Makefile.am | 4 - .../api/{classification => }/classification.c | 2 +- .../api/{classification => }/classification.h | 0 test/validation/api/classification/.gitignore | 1 - test/validation/api/classification/Makefile.am | 11 -- ...assification_basic.c => classification_basic.c} | 2 +- ...sification_common.c => classification_common.c} | 2 +- ...cation_test_pmr.c => classification_test_pmr.c} | 2 +- ...assification_tests.c => classification_tests.c} | 2 +- ...on_testsuites.h => classification_testsuites.h} | 0 test/validation/api/{cpumask => }/cpumask.c | 0 test/validation/api/cpumask/.gitignore | 1 - test/validation/api/cpumask/Makefile.am | 5 - .../api/{crypto/odp_crypto_test_inp.c => crypto.c} | 2 +- test/validation/api/crypto/.gitignore | 1 - test/validation/api/crypto/Makefile.am | 7 - test/validation/api/crypto/test_vectors_len.h | 77 --------- .../test_vectors.h => crypto_test_vectors.h} | 68 +++++++- test/validation/api/{errno => }/errno.c | 0 test/validation/api/errno/.gitignore | 1 - test/validation/api/errno/Makefile.am | 4 - test/validation/api/{event => }/event.c | 0 test/validation/api/event/.gitignore | 1 - test/validation/api/event/Makefile.am | 4 - test/validation/api/{hash => }/hash.c | 0 test/validation/api/hash/.gitignore | 1 - test/validation/api/hash/Makefile.am | 4 - test/validation/api/init/.gitignore | 3 - test/validation/api/init/Makefile.am | 9 -- test/validation/api/{init => }/init_main_abort.c | 0 test/validation/api/{init => }/init_main_log.c | 0 test/validation/api/{init => }/init_main_ok.c | 0 test/validation/api/{ipsec => }/ipsec.c | 2 +- test/validation/api/{ipsec => }/ipsec.h | 0 test/validation/api/ipsec/.gitignore | 4 - test/validation/api/ipsec/Makefile.am | 24 --- test/validation/api/{ipsec => }/ipsec_async.c | 0 test/validation/api/{ipsec => }/ipsec_inline_in.c | 0 test/validation/api/{ipsec => }/ipsec_inline_out.c | 0 test/validation/api/{ipsec => }/ipsec_sync.c | 0 test/validation/api/{ipsec => }/ipsec_test_in.c | 2 +- test/validation/api/{ipsec => }/ipsec_test_out.c | 2 +- .../{ipsec/test_vectors.h => ipsec_test_vectors.h} | 0 test/validation/api/{lock => }/lock.c | 0 test/validation/api/lock/.gitignore | 1 - test/validation/api/lock/Makefile.am | 4 - test/validation/api/{packet => }/packet.c | 0 test/validation/api/packet/.gitignore | 1 - test/validation/api/packet/Makefile.am | 4 - test/validation/api/{pool => }/pool.c | 0 test/validation/api/pool/.gitignore | 1 - test/validation/api/pool/Makefile.am | 4 - test/validation/api/{queue => }/queue.c | 0 test/validation/api/queue/.gitignore | 1 - test/validation/api/queue/Makefile.am | 4 - test/validation/api/{random => }/random.c | 0 test/validation/api/random/.gitignore | 1 - test/validation/api/random/Makefile.am | 4 - test/validation/api/{scheduler => }/scheduler.c | 0 test/validation/api/scheduler/.gitignore | 1 - test/validation/api/scheduler/Makefile.am | 4 - test/validation/api/{shmem => }/shmem.c | 0 test/validation/api/shmem/.gitignore | 1 - test/validation/api/shmem/Makefile.am | 4 - test/validation/api/{std_clib => }/std_clib.c | 0 test/validation/api/std_clib/.gitignore | 1 - test/validation/api/std_clib/Makefile.am | 4 - test/validation/api/{system => }/system.c | 0 test/validation/api/system/.gitignore | 1 - test/validation/api/system/Makefile.am | 4 - test/validation/api/{thread => }/thread.c | 1 + test/validation/api/thread/.gitignore | 1 - test/validation/api/thread/Makefile.am | 6 - test/validation/api/{time => }/time.c | 0 test/validation/api/time/.gitignore | 1 - test/validation/api/time/Makefile.am | 4 - test/validation/api/{timer => }/timer.c | 0 test/validation/api/timer/.gitignore | 1 - test/validation/api/timer/Makefile.am | 4 - 94 files changed, 225 insertions(+), 332 deletions(-) delete mode 100644 platform/linux-generic/test/validation/api/pktio/.gitignore rename test/validation/api/{atomic => }/atomic.c (100%) delete mode 100644 test/validation/api/atomic/.gitignore delete mode 100644 test/validation/api/atomic/Makefile.am rename test/validation/api/{barrier => }/barrier.c (100%) delete mode 100644 test/validation/api/barrier/.gitignore delete mode 100644 test/validation/api/barrier/Makefile.am rename test/validation/api/{buffer => }/buffer.c (100%) delete mode 100644 test/validation/api/buffer/.gitignore delete mode 100644 test/validation/api/buffer/Makefile.am rename test/validation/api/{chksum => }/chksum.c (100%) delete mode 100644 test/validation/api/chksum/.gitignore delete mode 100644 test/validation/api/chksum/Makefile.am rename test/validation/api/{classification => }/classification.c (95%) rename test/validation/api/{classification => }/classification.h (100%) delete mode 100644 test/validation/api/classification/.gitignore delete mode 100644 test/validation/api/classification/Makefile.am rename test/validation/api/{classification/odp_classification_basic.c => classification_basic.c} (99%) rename test/validation/api/{classification/odp_classification_common.c => classification_common.c} (99%) rename test/validation/api/{classification/odp_classification_test_pmr.c => classification_test_pmr.c} (99%) rename test/validation/api/{classification/odp_classification_tests.c => classification_tests.c} (99%) rename test/validation/api/{classification/odp_classification_testsuites.h => classification_testsuites.h} (100%) rename test/validation/api/{cpumask => }/cpumask.c (100%) delete mode 100644 test/validation/api/cpumask/.gitignore delete mode 100644 test/validation/api/cpumask/Makefile.am rename test/validation/api/{crypto/odp_crypto_test_inp.c => crypto.c} (99%) delete mode 100644 test/validation/api/crypto/.gitignore delete mode 100644 test/validation/api/crypto/Makefile.am delete mode 100644 test/validation/api/crypto/test_vectors_len.h rename test/validation/api/{crypto/test_vectors.h => crypto_test_vectors.h} (96%) rename test/validation/api/{errno => }/errno.c (100%) delete mode 100644 test/validation/api/errno/.gitignore delete mode 100644 test/validation/api/errno/Makefile.am rename test/validation/api/{event => }/event.c (100%) delete mode 100644 test/validation/api/event/.gitignore delete mode 100644 test/validation/api/event/Makefile.am rename test/validation/api/{hash => }/hash.c (100%) delete mode 100644 test/validation/api/hash/.gitignore delete mode 100644 test/validation/api/hash/Makefile.am delete mode 100644 test/validation/api/init/.gitignore delete mode 100644 test/validation/api/init/Makefile.am rename test/validation/api/{init => }/init_main_abort.c (100%) rename test/validation/api/{init => }/init_main_log.c (100%) rename test/validation/api/{init => }/init_main_ok.c (100%) rename test/validation/api/{ipsec => }/ipsec.c (99%) rename test/validation/api/{ipsec => }/ipsec.h (100%) delete mode 100644 test/validation/api/ipsec/.gitignore delete mode 100644 test/validation/api/ipsec/Makefile.am rename test/validation/api/{ipsec => }/ipsec_async.c (100%) rename test/validation/api/{ipsec => }/ipsec_inline_in.c (100%) rename test/validation/api/{ipsec => }/ipsec_inline_out.c (100%) rename test/validation/api/{ipsec => }/ipsec_sync.c (100%) rename test/validation/api/{ipsec => }/ipsec_test_in.c (99%) rename test/validation/api/{ipsec => }/ipsec_test_out.c (99%) rename test/validation/api/{ipsec/test_vectors.h => ipsec_test_vectors.h} (100%) rename test/validation/api/{lock => }/lock.c (100%) delete mode 100644 test/validation/api/lock/.gitignore delete mode 100644 test/validation/api/lock/Makefile.am rename test/validation/api/{packet => }/packet.c (100%) delete mode 100644 test/validation/api/packet/.gitignore delete mode 100644 test/validation/api/packet/Makefile.am rename test/validation/api/{pool => }/pool.c (100%) delete mode 100644 test/validation/api/pool/.gitignore delete mode 100644 test/validation/api/pool/Makefile.am rename test/validation/api/{queue => }/queue.c (100%) delete mode 100644 test/validation/api/queue/.gitignore delete mode 100644 test/validation/api/queue/Makefile.am rename test/validation/api/{random => }/random.c (100%) delete mode 100644 test/validation/api/random/.gitignore delete mode 100644 test/validation/api/random/Makefile.am rename test/validation/api/{scheduler => }/scheduler.c (100%) delete mode 100644 test/validation/api/scheduler/.gitignore delete mode 100644 test/validation/api/scheduler/Makefile.am rename test/validation/api/{shmem => }/shmem.c (100%) delete mode 100644 test/validation/api/shmem/.gitignore delete mode 100644 test/validation/api/shmem/Makefile.am rename test/validation/api/{std_clib => }/std_clib.c (100%) delete mode 100644 test/validation/api/std_clib/.gitignore delete mode 100644 test/validation/api/std_clib/Makefile.am rename test/validation/api/{system => }/system.c (100%) delete mode 100644 test/validation/api/system/.gitignore delete mode 100644 test/validation/api/system/Makefile.am rename test/validation/api/{thread => }/thread.c (99%) delete mode 100644 test/validation/api/thread/.gitignore delete mode 100644 test/validation/api/thread/Makefile.am rename test/validation/api/{time => }/time.c (100%) delete mode 100644 test/validation/api/time/.gitignore delete mode 100644 test/validation/api/time/Makefile.am rename test/validation/api/{timer => }/timer.c (100%) delete mode 100644 test/validation/api/timer/.gitignore delete mode 100644 test/validation/api/timer/Makefile.am diff --git a/platform/linux-generic/test/validation/api/pktio/.gitignore b/platform/linux-generic/test/validation/api/pktio/.gitignore deleted file mode 100644 index 7e563b8b3..000000000 --- a/platform/linux-generic/test/validation/api/pktio/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.log -*.trs diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index dd07839ff..5a0b4d685 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -7,30 +7,6 @@ AC_CONFIG_FILES([test/Makefile test/miscellaneous/Makefile test/performance/Makefile test/validation/Makefile - test/validation/api/atomic/Makefile - test/validation/api/barrier/Makefile - test/validation/api/buffer/Makefile - test/validation/api/chksum/Makefile - test/validation/api/classification/Makefile - test/validation/api/cpumask/Makefile - test/validation/api/crypto/Makefile - test/validation/api/errno/Makefile - test/validation/api/event/Makefile - test/validation/api/hash/Makefile - test/validation/api/init/Makefile - test/validation/api/ipsec/Makefile - test/validation/api/lock/Makefile test/validation/api/Makefile - test/validation/api/packet/Makefile test/validation/api/pktio/Makefile - test/validation/api/pool/Makefile - test/validation/api/queue/Makefile - test/validation/api/random/Makefile - test/validation/api/scheduler/Makefile - test/validation/api/shmem/Makefile - test/validation/api/std_clib/Makefile - test/validation/api/system/Makefile - test/validation/api/thread/Makefile - test/validation/api/time/Makefile - test/validation/api/timer/Makefile test/validation/api/traffic_mngr/Makefile]) diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index 5dabf91c1..6fb6ee62e 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -1,3 +1,32 @@ *.log *.trs tests-validation.env +atomic_main +barrier_main +buffer_main +chksum_main +classification_main +cpumask_main +crypto_main +errno_main +event_main +hash_main +init_main_abort +init_main_log +init_main_ok +ipsec_async +ipsec_inline_in +ipsec_inline_out +ipsec_sync +lock_main +packet_main +pool_main +queue_main +random_main +scheduler_main +shmem_main +std_clib_main +system_main +thread_main +time_main +timer_main diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index c92d123c1..2b51a132b 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,66 +1,129 @@ -ODP_MODULES = atomic \ - barrier \ - buffer \ - chksum \ - classification \ - cpumask \ - crypto \ - errno \ - event \ - hash \ - init \ - ipsec \ - lock \ - queue \ - packet \ +ODP_MODULES = \ pktio \ - pool \ - random \ - scheduler \ - std_clib \ - thread \ - time \ - timer \ - traffic_mngr \ - shmem \ - system + traffic_mngr SUBDIRS = $(ODP_MODULES) -include $(top_srcdir)/test/Makefile.inc +include Makefile.inc + +test_PROGRAMS = \ + atomic_main \ + barrier_main \ + buffer_main \ + chksum_main \ + classification_main \ + cpumask_main \ + crypto_main \ + errno_main \ + event_main \ + hash_main \ + init_main_abort \ + init_main_log \ + init_main_ok \ + ipsec_async \ + ipsec_inline_in \ + ipsec_inline_out \ + ipsec_sync \ + lock_main \ + packet_main \ + pool_main \ + queue_main \ + random_main \ + scheduler_main \ + shmem_main \ + std_clib_main \ + system_main \ + thread_main \ + time_main \ + timer_main + +noinst_LTLIBRARIES = libtestipsec.la +libtestipsec_la_SOURCES = \ + ipsec_test_vectors.h \ + ipsec_test_in.c \ + ipsec_test_out.c \ + ipsec.h \ + ipsec.c + +libtestipsec_la_CPPFLAGS = $(AM_CPPFLAGS) -Wno-error=missing-field-initializers + +atomic_main_SOURCES = atomic.c +barrier_main_SOURCES = barrier.c +buffer_main_SOURCES = buffer.c +chksum_main_SOURCES = chksum.c +cpumask_main_SOURCES = cpumask.c +cpumask_main_LDADD = $(LDADD) $(LIBCPUMASK_COMMON) +crypto_main_SOURCES = crypto.c crypto_test_vectors.h +errno_main_SOURCES = errno.c +event_main_SOURCES = event.c +hash_main_SOURCES = hash.c +init_main_abort_SOURCES = init_main_abort.c +init_main_log_SOURCES = init_main_log.c +init_main_ok_SOURCES = init_main_ok.c +ipsec_sync_SOURCES = ipsec_sync.c +ipsec_sync_LDADD = $(LDADD) libtestipsec.la +ipsec_async_SOURCES = ipsec_async.c +ipsec_async_LDADD = $(LDADD) libtestipsec.la +ipsec_inline_in_SOURCES = ipsec_inline_in.c +ipsec_inline_in_LDADD = $(LDADD) libtestipsec.la +ipsec_inline_out_SOURCES = ipsec_inline_out.c +ipsec_inline_out_LDADD = $(LDADD) libtestipsec.la +lock_main_SOURCES = lock.c +packet_main_SOURCES = packet.c +pool_main_SOURCES = pool.c +queue_main_SOURCES = queue.c +random_main_SOURCES = random.c +scheduler_main_SOURCES = scheduler.c +shmem_main_SOURCES = shmem.c +std_clib_main_SOURCES = std_clib.c +system_main_SOURCES = system.c +thread_main_SOURCES = thread.c +thread_main_LDADD = $(LDADD) $(LIBTHRMASK_COMMON) +time_main_SOURCES = time.c +timer_main_SOURCES = timer.c + +classification_main_SOURCES = \ + classification_basic.c \ + classification_tests.c \ + classification_testsuites.h \ + classification_test_pmr.c \ + classification_common.c \ + classification.c \ + classification.h + TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation TESTS = \ - atomic/atomic_main$(EXEEXT) \ - barrier/barrier_main$(EXEEXT) \ - buffer/buffer_main$(EXEEXT) \ - chksum/chksum_main$(EXEEXT) \ - classification/classification_main$(EXEEXT) \ - cpumask/cpumask_main$(EXEEXT) \ - crypto/crypto_main$(EXEEXT) \ - errno/errno_main$(EXEEXT) \ - event/event_main$(EXEEXT) \ - hash/hash_main$(EXEEXT) \ - init/init_main_ok$(EXEEXT) \ - init/init_main_abort$(EXEEXT) \ - init/init_main_log$(EXEEXT) \ - ipsec/ipsec_sync$(EXEEXT) \ - ipsec/ipsec_async$(EXEEXT) \ - ipsec/ipsec_inline_in$(EXEEXT) \ - ipsec/ipsec_inline_out$(EXEEXT) \ - lock/lock_main$(EXEEXT) \ - packet/packet_main$(EXEEXT) \ - pool/pool_main$(EXEEXT) \ - queue/queue_main$(EXEEXT) \ - random/random_main$(EXEEXT) \ - scheduler/scheduler_main$(EXEEXT) \ - std_clib/std_clib_main$(EXEEXT) \ - thread/thread_main$(EXEEXT) \ - time/time_main$(EXEEXT) \ - timer/timer_main$(EXEEXT) \ - traffic_mngr/traffic_mngr.sh \ - shmem/shmem_main$(EXEEXT) \ - system/system_main$(EXEEXT) + atomic_main$(EXEEXT) \ + barrier_main$(EXEEXT) \ + buffer_main$(EXEEXT) \ + chksum_main$(EXEEXT) \ + classification_main$(EXEEXT) \ + cpumask_main$(EXEEXT) \ + crypto_main$(EXEEXT) \ + errno_main$(EXEEXT) \ + event_main$(EXEEXT) \ + hash_main$(EXEEXT) \ + init_main_ok$(EXEEXT) \ + init_main_abort$(EXEEXT) \ + init_main_log$(EXEEXT) \ + ipsec_sync$(EXEEXT) \ + ipsec_async$(EXEEXT) \ + ipsec_inline_in$(EXEEXT) \ + ipsec_inline_out$(EXEEXT) \ + lock_main$(EXEEXT) \ + packet_main$(EXEEXT) \ + pool_main$(EXEEXT) \ + queue_main$(EXEEXT) \ + random_main$(EXEEXT) \ + scheduler_main$(EXEEXT) \ + shmem_main$(EXEEXT) \ + std_clib_main$(EXEEXT) \ + system_main$(EXEEXT) \ + thread_main$(EXEEXT) \ + time_main$(EXEEXT) \ + timer_main$(EXEEXT) \ + traffic_mngr/traffic_mngr.sh TESTNAME = validation diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic.c similarity index 100% rename from test/validation/api/atomic/atomic.c rename to test/validation/api/atomic.c diff --git a/test/validation/api/atomic/.gitignore b/test/validation/api/atomic/.gitignore deleted file mode 100644 index 610ffeab0..000000000 --- a/test/validation/api/atomic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -atomic_main diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am deleted file mode 100644 index 41ad2e6b6..000000000 --- a/test/validation/api/atomic/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = atomic_main -atomic_main_SOURCES = atomic.c diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier.c similarity index 100% rename from test/validation/api/barrier/barrier.c rename to test/validation/api/barrier.c diff --git a/test/validation/api/barrier/.gitignore b/test/validation/api/barrier/.gitignore deleted file mode 100644 index 2e0ee7ade..000000000 --- a/test/validation/api/barrier/.gitignore +++ /dev/null @@ -1 +0,0 @@ -barrier_main diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am deleted file mode 100644 index f5f751b88..000000000 --- a/test/validation/api/barrier/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = barrier_main -barrier_main_SOURCES = barrier.c diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer.c similarity index 100% rename from test/validation/api/buffer/buffer.c rename to test/validation/api/buffer.c diff --git a/test/validation/api/buffer/.gitignore b/test/validation/api/buffer/.gitignore deleted file mode 100644 index 0e8ac15c1..000000000 --- a/test/validation/api/buffer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -buffer_main diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am deleted file mode 100644 index f459010c3..000000000 --- a/test/validation/api/buffer/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = buffer_main -buffer_main_SOURCES = buffer.c diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum.c similarity index 100% rename from test/validation/api/chksum/chksum.c rename to test/validation/api/chksum.c diff --git a/test/validation/api/chksum/.gitignore b/test/validation/api/chksum/.gitignore deleted file mode 100644 index c69e8c470..000000000 --- a/test/validation/api/chksum/.gitignore +++ /dev/null @@ -1 +0,0 @@ -chksum_main diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am deleted file mode 100644 index 349fdd641..000000000 --- a/test/validation/api/chksum/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = chksum_main -chksum_main_SOURCES = chksum.c diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification.c similarity index 95% rename from test/validation/api/classification/classification.c rename to test/validation/api/classification.c index e89ffbee4..ddff5dd74 100644 --- a/test/validation/api/classification/classification.c +++ b/test/validation/api/classification.c @@ -8,7 +8,7 @@ #include #include -#include "odp_classification_testsuites.h" +#include "classification_testsuites.h" #include "classification.h" odp_suiteinfo_t classification_suites[] = { diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification.h similarity index 100% rename from test/validation/api/classification/classification.h rename to test/validation/api/classification.h diff --git a/test/validation/api/classification/.gitignore b/test/validation/api/classification/.gitignore deleted file mode 100644 index e2cdfefe1..000000000 --- a/test/validation/api/classification/.gitignore +++ /dev/null @@ -1 +0,0 @@ -classification_main diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am deleted file mode 100644 index e17f9f654..000000000 --- a/test/validation/api/classification/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = classification_main -classification_main_SOURCES = \ - odp_classification_basic.c \ - odp_classification_tests.c \ - odp_classification_testsuites.h \ - odp_classification_test_pmr.c \ - odp_classification_common.c \ - classification.c \ - classification.h diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification_basic.c similarity index 99% rename from test/validation/api/classification/odp_classification_basic.c rename to test/validation/api/classification_basic.c index 8b3738b75..5506ac079 100644 --- a/test/validation/api/classification/odp_classification_basic.c +++ b/test/validation/api/classification_basic.c @@ -7,7 +7,7 @@ #include "config.h" #include -#include "odp_classification_testsuites.h" +#include "classification_testsuites.h" #include "classification.h" #define PMR_SET_NUM 5 diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification_common.c similarity index 99% rename from test/validation/api/classification/odp_classification_common.c rename to test/validation/api/classification_common.c index 60e20ea87..aabc504fd 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification_common.c @@ -6,7 +6,7 @@ #include "config.h" -#include "odp_classification_testsuites.h" +#include "classification_testsuites.h" #include "classification.h" #include #include "test_debug.h" diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification_test_pmr.c similarity index 99% rename from test/validation/api/classification/odp_classification_test_pmr.c rename to test/validation/api/classification_test_pmr.c index f21b8addd..12ef7c516 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification_test_pmr.c @@ -6,7 +6,7 @@ #include "config.h" -#include "odp_classification_testsuites.h" +#include "classification_testsuites.h" #include "classification.h" #include diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification_tests.c similarity index 99% rename from test/validation/api/classification/odp_classification_tests.c rename to test/validation/api/classification_tests.c index 4cd727f9a..5a5f3a8c5 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification_tests.c @@ -6,7 +6,7 @@ #include "config.h" -#include "odp_classification_testsuites.h" +#include "classification_testsuites.h" #include "classification.h" #include diff --git a/test/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification_testsuites.h similarity index 100% rename from test/validation/api/classification/odp_classification_testsuites.h rename to test/validation/api/classification_testsuites.h diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask.c similarity index 100% rename from test/validation/api/cpumask/cpumask.c rename to test/validation/api/cpumask.c diff --git a/test/validation/api/cpumask/.gitignore b/test/validation/api/cpumask/.gitignore deleted file mode 100644 index 655a1640f..000000000 --- a/test/validation/api/cpumask/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cpumask_main diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am deleted file mode 100644 index 3872c1bd4..000000000 --- a/test/validation/api/cpumask/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = cpumask_main -cpumask_main_SOURCES = cpumask.c -LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto.c similarity index 99% rename from test/validation/api/crypto/odp_crypto_test_inp.c rename to test/validation/api/crypto.c index ec477535f..de449d480 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto.c @@ -9,7 +9,7 @@ #include #include #include -#include "test_vectors.h" +#include "crypto_test_vectors.h" #define MAX_ALG_CAPA 32 diff --git a/test/validation/api/crypto/.gitignore b/test/validation/api/crypto/.gitignore deleted file mode 100644 index 0ac55e35e..000000000 --- a/test/validation/api/crypto/.gitignore +++ /dev/null @@ -1 +0,0 @@ -crypto_main diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am deleted file mode 100644 index cc4d49d60..000000000 --- a/test/validation/api/crypto/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = crypto_main -crypto_main_SOURCES = \ - odp_crypto_test_inp.c \ - test_vectors.h \ - test_vectors_len.h diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h deleted file mode 100644 index 140bef2a2..000000000 --- a/test/validation/api/crypto/test_vectors_len.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#ifndef TEST_VECTORS_LEN_ -#define TEST_VECTORS_LEN_ - -/* Maximum */ -#define MAX_KEY_LEN 64 -#define MAX_IV_LEN 16 -#define MAX_DATA_LEN 128 -#define MAX_AAD_LEN 12 -#define MAX_DIGEST_LEN 64 - -/* TDES-CBC */ -#define TDES_CBC_KEY_LEN 24 -#define TDES_CBC_IV_LEN 8 - -/* AES-CBC common */ -#define AES_CBC_IV_LEN 16 - -/* AES128-CBC */ -#define AES128_CBC_KEY_LEN 16 - -/* AES192-CBC */ -#define AES192_CBC_KEY_LEN 24 - -/* AES256-CBC */ -#define AES256_CBC_KEY_LEN 32 - -/* AES-CBC common */ -#define AES_CTR_IV_LEN 16 - -/* AES128-CTR */ -#define AES128_CTR_KEY_LEN 16 - -/* AES192-CTR */ -#define AES192_CTR_KEY_LEN 24 - -/* AES256-CTR */ -#define AES256_CTR_KEY_LEN 32 - -/* AES-GCM common */ -#define AES_GCM_IV_LEN 12 -#define AES_GCM_DIGEST_LEN 16 - -/* AES128-GCM */ -#define AES128_GCM_KEY_LEN 16 - -/* AES192-GCM */ -#define AES192_GCM_KEY_LEN 24 - -/* AES256-GCM */ -#define AES256_GCM_KEY_LEN 32 - -/* HMAC-MD5 */ -#define HMAC_MD5_KEY_LEN 16 -#define HMAC_MD5_96_CHECK_LEN 12 -#define HMAC_MD5_CHECK_LEN 16 - -/* HMAC-SHA256 */ -#define HMAC_SHA256_KEY_LEN 32 -#define HMAC_SHA256_128_CHECK_LEN 16 -#define HMAC_SHA256_CHECK_LEN 32 - -/* HMAC-SHA1 */ -#define HMAC_SHA1_KEY_LEN 20 -#define HMAC_SHA1_96_CHECK_LEN 12 -#define HMAC_SHA1_CHECK_LEN 20 - -/* HMAC-SHA512 */ -#define HMAC_SHA512_KEY_LEN 64 -#define HMAC_SHA512_256_CHECK_LEN 32 -#define HMAC_SHA512_CHECK_LEN 64 - -#endif diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto_test_vectors.h similarity index 96% rename from test/validation/api/crypto/test_vectors.h rename to test/validation/api/crypto_test_vectors.h index 6592a3357..061db05bc 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto_test_vectors.h @@ -7,7 +7,73 @@ #ifndef _ODP_TEST_CRYPTO_VECTORS_H_ #define _ODP_TEST_CRYPTO_VECTORS_H_ -#include "test_vectors_len.h" +/* Maximum */ +#define MAX_KEY_LEN 64 +#define MAX_IV_LEN 16 +#define MAX_DATA_LEN 128 +#define MAX_AAD_LEN 12 +#define MAX_DIGEST_LEN 64 + +/* TDES-CBC */ +#define TDES_CBC_KEY_LEN 24 +#define TDES_CBC_IV_LEN 8 + +/* AES-CBC common */ +#define AES_CBC_IV_LEN 16 + +/* AES128-CBC */ +#define AES128_CBC_KEY_LEN 16 + +/* AES192-CBC */ +#define AES192_CBC_KEY_LEN 24 + +/* AES256-CBC */ +#define AES256_CBC_KEY_LEN 32 + +/* AES-CBC common */ +#define AES_CTR_IV_LEN 16 + +/* AES128-CTR */ +#define AES128_CTR_KEY_LEN 16 + +/* AES192-CTR */ +#define AES192_CTR_KEY_LEN 24 + +/* AES256-CTR */ +#define AES256_CTR_KEY_LEN 32 + +/* AES-GCM common */ +#define AES_GCM_IV_LEN 12 +#define AES_GCM_DIGEST_LEN 16 + +/* AES128-GCM */ +#define AES128_GCM_KEY_LEN 16 + +/* AES192-GCM */ +#define AES192_GCM_KEY_LEN 24 + +/* AES256-GCM */ +#define AES256_GCM_KEY_LEN 32 + +/* HMAC-MD5 */ +#define HMAC_MD5_KEY_LEN 16 +#define HMAC_MD5_96_CHECK_LEN 12 +#define HMAC_MD5_CHECK_LEN 16 + +/* HMAC-SHA256 */ +#define HMAC_SHA256_KEY_LEN 32 +#define HMAC_SHA256_128_CHECK_LEN 16 +#define HMAC_SHA256_CHECK_LEN 32 + +/* HMAC-SHA1 */ +#define HMAC_SHA1_KEY_LEN 20 +#define HMAC_SHA1_96_CHECK_LEN 12 +#define HMAC_SHA1_CHECK_LEN 20 + +/* HMAC-SHA512 */ +#define HMAC_SHA512_KEY_LEN 64 +#define HMAC_SHA512_256_CHECK_LEN 32 +#define HMAC_SHA512_CHECK_LEN 64 typedef struct crypto_test_reference_s { uint32_t cipher_key_length; diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno.c similarity index 100% rename from test/validation/api/errno/errno.c rename to test/validation/api/errno.c diff --git a/test/validation/api/errno/.gitignore b/test/validation/api/errno/.gitignore deleted file mode 100644 index 12256e38c..000000000 --- a/test/validation/api/errno/.gitignore +++ /dev/null @@ -1 +0,0 @@ -errno_main diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am deleted file mode 100644 index de13afbfb..000000000 --- a/test/validation/api/errno/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = errno_main -errno_main_SOURCES = errno.c diff --git a/test/validation/api/event/event.c b/test/validation/api/event.c similarity index 100% rename from test/validation/api/event/event.c rename to test/validation/api/event.c diff --git a/test/validation/api/event/.gitignore b/test/validation/api/event/.gitignore deleted file mode 100644 index 05d34d7c8..000000000 --- a/test/validation/api/event/.gitignore +++ /dev/null @@ -1 +0,0 @@ -event_main diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am deleted file mode 100644 index 0d26035ed..000000000 --- a/test/validation/api/event/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = event_main -event_main_SOURCES = event.c diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash.c similarity index 100% rename from test/validation/api/hash/hash.c rename to test/validation/api/hash.c diff --git a/test/validation/api/hash/.gitignore b/test/validation/api/hash/.gitignore deleted file mode 100644 index 6d0bc9314..000000000 --- a/test/validation/api/hash/.gitignore +++ /dev/null @@ -1 +0,0 @@ -hash_main diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am deleted file mode 100644 index 0d843ea74..000000000 --- a/test/validation/api/hash/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = hash_main -hash_main_SOURCES = hash.c diff --git a/test/validation/api/init/.gitignore b/test/validation/api/init/.gitignore deleted file mode 100644 index f433708b0..000000000 --- a/test/validation/api/init/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -init_main_abort -init_main_log -init_main_ok diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am deleted file mode 100644 index 5af2e00bc..000000000 --- a/test/validation/api/init/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include ../Makefile.inc - -# most platforms are expected not to support multiple ODP inits -# following each other: therefore 3 separate binaries are -# created, each containing its ODP init test. -test_PROGRAMS = init_main_abort init_main_log init_main_ok -init_main_abort_SOURCES = init_main_abort.c -init_main_log_SOURCES = init_main_log.c -init_main_ok_SOURCES = init_main_ok.c diff --git a/test/validation/api/init/init_main_abort.c b/test/validation/api/init_main_abort.c similarity index 100% rename from test/validation/api/init/init_main_abort.c rename to test/validation/api/init_main_abort.c diff --git a/test/validation/api/init/init_main_log.c b/test/validation/api/init_main_log.c similarity index 100% rename from test/validation/api/init/init_main_log.c rename to test/validation/api/init_main_log.c diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init_main_ok.c similarity index 100% rename from test/validation/api/init/init_main_ok.c rename to test/validation/api/init_main_ok.c diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec.c similarity index 99% rename from test/validation/api/ipsec/ipsec.c rename to test/validation/api/ipsec.c index b16f84ac9..b4c5f9cba 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec.c @@ -12,7 +12,7 @@ #include "ipsec.h" -#include "test_vectors.h" +#include "ipsec_test_vectors.h" struct suite_context_s suite_context; diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec.h similarity index 100% rename from test/validation/api/ipsec/ipsec.h rename to test/validation/api/ipsec.h diff --git a/test/validation/api/ipsec/.gitignore b/test/validation/api/ipsec/.gitignore deleted file mode 100644 index 967356064..000000000 --- a/test/validation/api/ipsec/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -ipsec_sync -ipsec_async -ipsec_inline_in -ipsec_inline_out diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am deleted file mode 100644 index 328826995..000000000 --- a/test/validation/api/ipsec/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -include ../Makefile.inc - -AM_CPPFLAGS += -Wno-error=missing-field-initializers - -noinst_LTLIBRARIES = libtestipsec.la -libtestipsec_la_SOURCES = \ - test_vectors.h \ - ipsec_test_in.c \ - ipsec_test_out.c \ - ipsec.h \ - ipsec.c - -test_PROGRAMS = \ - ipsec_sync \ - ipsec_async \ - ipsec_inline_in \ - ipsec_inline_out - -ipsec_sync_SOURCES = ipsec_sync.c -ipsec_async_SOURCES = ipsec_async.c -ipsec_inline_in_SOURCES = ipsec_inline_in.c -ipsec_inline_out_SOURCES = ipsec_inline_out.c - -LDADD += libtestipsec.la diff --git a/test/validation/api/ipsec/ipsec_async.c b/test/validation/api/ipsec_async.c similarity index 100% rename from test/validation/api/ipsec/ipsec_async.c rename to test/validation/api/ipsec_async.c diff --git a/test/validation/api/ipsec/ipsec_inline_in.c b/test/validation/api/ipsec_inline_in.c similarity index 100% rename from test/validation/api/ipsec/ipsec_inline_in.c rename to test/validation/api/ipsec_inline_in.c diff --git a/test/validation/api/ipsec/ipsec_inline_out.c b/test/validation/api/ipsec_inline_out.c similarity index 100% rename from test/validation/api/ipsec/ipsec_inline_out.c rename to test/validation/api/ipsec_inline_out.c diff --git a/test/validation/api/ipsec/ipsec_sync.c b/test/validation/api/ipsec_sync.c similarity index 100% rename from test/validation/api/ipsec/ipsec_sync.c rename to test/validation/api/ipsec_sync.c diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec_test_in.c similarity index 99% rename from test/validation/api/ipsec/ipsec_test_in.c rename to test/validation/api/ipsec_test_in.c index 6262f4cb5..606a64428 100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec_test_in.c @@ -8,7 +8,7 @@ #include "ipsec.h" -#include "test_vectors.h" +#include "ipsec_test_vectors.h" static void test_in_ipv4_ah_sha256(void) { diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec_test_out.c similarity index 99% rename from test/validation/api/ipsec/ipsec_test_out.c rename to test/validation/api/ipsec_test_out.c index 4751e6ec8..29f09711f 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec_test_out.c @@ -8,7 +8,7 @@ #include "ipsec.h" -#include "test_vectors.h" +#include "ipsec_test_vectors.h" static void test_out_ipv4_ah_sha256(void) { diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec_test_vectors.h similarity index 100% rename from test/validation/api/ipsec/test_vectors.h rename to test/validation/api/ipsec_test_vectors.h diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock.c similarity index 100% rename from test/validation/api/lock/lock.c rename to test/validation/api/lock.c diff --git a/test/validation/api/lock/.gitignore b/test/validation/api/lock/.gitignore deleted file mode 100644 index ff16646f4..000000000 --- a/test/validation/api/lock/.gitignore +++ /dev/null @@ -1 +0,0 @@ -lock_main diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am deleted file mode 100644 index ad75e1854..000000000 --- a/test/validation/api/lock/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = lock_main -lock_main_SOURCES = lock.c diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet.c similarity index 100% rename from test/validation/api/packet/packet.c rename to test/validation/api/packet.c diff --git a/test/validation/api/packet/.gitignore b/test/validation/api/packet/.gitignore deleted file mode 100644 index c05530d2d..000000000 --- a/test/validation/api/packet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -packet_main diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am deleted file mode 100644 index ad5775d7e..000000000 --- a/test/validation/api/packet/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = packet_main -packet_main_SOURCES = packet.c diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool.c similarity index 100% rename from test/validation/api/pool/pool.c rename to test/validation/api/pool.c diff --git a/test/validation/api/pool/.gitignore b/test/validation/api/pool/.gitignore deleted file mode 100644 index fc91b28d6..000000000 --- a/test/validation/api/pool/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pool_main diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am deleted file mode 100644 index 1b0d5934c..000000000 --- a/test/validation/api/pool/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = pool_main -pool_main_SOURCES = pool.c diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue.c similarity index 100% rename from test/validation/api/queue/queue.c rename to test/validation/api/queue.c diff --git a/test/validation/api/queue/.gitignore b/test/validation/api/queue/.gitignore deleted file mode 100644 index 469506a13..000000000 --- a/test/validation/api/queue/.gitignore +++ /dev/null @@ -1 +0,0 @@ -queue_main diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am deleted file mode 100644 index 94a6b28a9..000000000 --- a/test/validation/api/queue/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = queue_main -queue_main_SOURCES = queue.c diff --git a/test/validation/api/random/random.c b/test/validation/api/random.c similarity index 100% rename from test/validation/api/random/random.c rename to test/validation/api/random.c diff --git a/test/validation/api/random/.gitignore b/test/validation/api/random/.gitignore deleted file mode 100644 index 2c88ec0b8..000000000 --- a/test/validation/api/random/.gitignore +++ /dev/null @@ -1 +0,0 @@ -random_main diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am deleted file mode 100644 index e24ce0af7..000000000 --- a/test/validation/api/random/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = random_main -random_main_SOURCES = random.c diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler.c similarity index 100% rename from test/validation/api/scheduler/scheduler.c rename to test/validation/api/scheduler.c diff --git a/test/validation/api/scheduler/.gitignore b/test/validation/api/scheduler/.gitignore deleted file mode 100644 index b4eb30091..000000000 --- a/test/validation/api/scheduler/.gitignore +++ /dev/null @@ -1 +0,0 @@ -scheduler_main diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am deleted file mode 100644 index 050f22308..000000000 --- a/test/validation/api/scheduler/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = scheduler_main -scheduler_main_SOURCES = scheduler.c diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem.c similarity index 100% rename from test/validation/api/shmem/shmem.c rename to test/validation/api/shmem.c diff --git a/test/validation/api/shmem/.gitignore b/test/validation/api/shmem/.gitignore deleted file mode 100644 index 4d82fd53a..000000000 --- a/test/validation/api/shmem/.gitignore +++ /dev/null @@ -1 +0,0 @@ -shmem_main diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am deleted file mode 100644 index 52e33fdca..000000000 --- a/test/validation/api/shmem/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = shmem_main -shmem_main_SOURCES = shmem.c diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib.c similarity index 100% rename from test/validation/api/std_clib/std_clib.c rename to test/validation/api/std_clib.c diff --git a/test/validation/api/std_clib/.gitignore b/test/validation/api/std_clib/.gitignore deleted file mode 100644 index 37828330a..000000000 --- a/test/validation/api/std_clib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -std_clib_main diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am deleted file mode 100644 index 9d3b32d3f..000000000 --- a/test/validation/api/std_clib/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = std_clib_main -std_clib_main_SOURCES = std_clib.c diff --git a/test/validation/api/system/system.c b/test/validation/api/system.c similarity index 100% rename from test/validation/api/system/system.c rename to test/validation/api/system.c diff --git a/test/validation/api/system/.gitignore b/test/validation/api/system/.gitignore deleted file mode 100644 index 347b1ee21..000000000 --- a/test/validation/api/system/.gitignore +++ /dev/null @@ -1 +0,0 @@ -system_main diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am deleted file mode 100644 index 8090b0b5a..000000000 --- a/test/validation/api/system/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = system_main -system_main_SOURCES = system.c diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread.c similarity index 99% rename from test/validation/api/thread/thread.c rename to test/validation/api/thread.c index fe504e888..f45521766 100644 --- a/test/validation/api/thread/thread.c +++ b/test/validation/api/thread.c @@ -6,6 +6,7 @@ #include "config.h" +#define TEST_THRMASK #include #include #include diff --git a/test/validation/api/thread/.gitignore b/test/validation/api/thread/.gitignore deleted file mode 100644 index ab1787d97..000000000 --- a/test/validation/api/thread/.gitignore +++ /dev/null @@ -1 +0,0 @@ -thread_main diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am deleted file mode 100644 index cbd8b2a7b..000000000 --- a/test/validation/api/thread/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = thread_main -thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK -thread_main_SOURCES = thread.c -LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/time/time.c b/test/validation/api/time.c similarity index 100% rename from test/validation/api/time/time.c rename to test/validation/api/time.c diff --git a/test/validation/api/time/.gitignore b/test/validation/api/time/.gitignore deleted file mode 100644 index 0ef3e6162..000000000 --- a/test/validation/api/time/.gitignore +++ /dev/null @@ -1 +0,0 @@ -time_main diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am deleted file mode 100644 index 9b0392eb9..000000000 --- a/test/validation/api/time/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = time_main -time_main_SOURCES = time.c diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer.c similarity index 100% rename from test/validation/api/timer/timer.c rename to test/validation/api/timer.c diff --git a/test/validation/api/timer/.gitignore b/test/validation/api/timer/.gitignore deleted file mode 100644 index 74e8fa992..000000000 --- a/test/validation/api/timer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -timer_main diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am deleted file mode 100644 index bc33e731f..000000000 --- a/test/validation/api/timer/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = timer_main -timer_main_SOURCES = timer.c From patchwork Thu Feb 22 11:00:07 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: 129197 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp469192lja; Thu, 22 Feb 2018 03:05:27 -0800 (PST) X-Google-Smtp-Source: AH8x226yH9LkzmD5MsrKffcwpO51pJjfd0Gcz5e7vBtJxRX1NgRESe0/ETW9YpeNpwQ78ufJUynQ X-Received: by 10.55.75.133 with SMTP id y127mr10255861qka.103.1519297526870; Thu, 22 Feb 2018 03:05:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297526; cv=none; d=google.com; s=arc-20160816; b=HXD8+qN1iCO84OPaRVH746sxD2LngiyO2+j8Ls3/lIcxUJXoMOxgsbHnBPlDHn530j U3uDkbKwqK+SgYU8FGZwbBnxIGPmyC1cwoMCiYE2hcFrrIG5DlR9BoUXj5efTN6nsi30 /b8MjsZ0DElB+VGYqoENtDx9m+c28BmI4PRe3kDfsm/rmAVu+uNuJcofQNfgtt9SMpKz /ATslTmWBglFykSUFpb5YkT9YVYrtiFVvaCOuQktJb7tS4ktCDcoCBOR5XCAfVfEKr06 PpcSclNHBt9Qr+9Qm61tWuX3dYKwgGeHwPFyrMwGinZYJK0jTi+QeNp90YvOs6C7YHjr g7Jw== 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=hya29XAA3TGq5+94/3YP0FKG7q+YiSyu+BV2p27pDgQ=; b=kN/4XcCgfpCbbNHcENpsdC1/5B2kF8+TYWqbhu/qcWm5xqvH5t9WCglqQwBmYVtcom /X1XPGOvJAAOuX3SFycIOU1Hsei37Rft5XrGaN2rfgmA8qdqjcECKaHoQArCEHU4p1pQ +J10L6aK8wL6tvIwuv4EJDf4JpJegkgfl2joDJW//SRblTQRe+y5IW5nFg0dZqEUmfL3 3qCguQoYbfgQejHhxKE/96hGVW5jfMKo5bPqbPkp8yw0mD0OPfXMYE2hO7wZHHsyzE18 PBX81dBppbaN2wKXWTmSbtegxOP6PTUBDRTFI7Sc145HOIhZwWEzxng81n0ypyWNhTYV BrSA== 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 f77si4101964qkf.387.2018.02.22.03.05.26; Thu, 22 Feb 2018 03:05:26 -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 552FF61831; Thu, 22 Feb 2018 11:05:26 +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 80FB0617A3; Thu, 22 Feb 2018 11:03:48 +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 A4CCE6063A; Thu, 22 Feb 2018 11:03:35 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id D35546063A for ; Thu, 22 Feb 2018 11:01:21 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward105j.mail.yandex.net (Yandex) with ESMTP id EFBF7183E2E for ; Thu, 22 Feb 2018 14:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id kZeX4EhDSg-0Haeiuj6; Thu, 22 Feb 2018 14:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0HYqljVI; Thu, 22 Feb 2018 14:00:17 +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: Thu, 22 Feb 2018 14:00:07 +0300 Message-Id: <1519297209-16246-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 6/8] validation: move traffic_mngr test to api/ 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ test/m4/configure.m4 | 3 +-- test/validation/api/.gitignore | 1 + test/validation/api/Makefile.am | 14 ++++++++++---- test/validation/api/{traffic_mngr => }/traffic_mngr.c | 0 test/validation/api/{traffic_mngr => }/traffic_mngr.sh | 4 ++-- test/validation/api/traffic_mngr/.gitignore | 1 - test/validation/api/traffic_mngr/Makefile.am | 10 ---------- 7 files changed, 14 insertions(+), 19 deletions(-) rename test/validation/api/{traffic_mngr => }/traffic_mngr.c (100%) rename test/validation/api/{traffic_mngr => }/traffic_mngr.sh (90%) delete mode 100644 test/validation/api/traffic_mngr/.gitignore delete mode 100644 test/validation/api/traffic_mngr/Makefile.am diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 5a0b4d685..18c71d799 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -8,5 +8,4 @@ AC_CONFIG_FILES([test/Makefile test/performance/Makefile test/validation/Makefile test/validation/api/Makefile - test/validation/api/pktio/Makefile - test/validation/api/traffic_mngr/Makefile]) + test/validation/api/pktio/Makefile]) diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index 6fb6ee62e..f6bf6e54b 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -30,3 +30,4 @@ system_main thread_main time_main timer_main +traffic_mngr_main diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 2b51a132b..0b6547b5e 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,6 +1,5 @@ ODP_MODULES = \ - pktio \ - traffic_mngr + pktio SUBDIRS = $(ODP_MODULES) @@ -35,7 +34,8 @@ test_PROGRAMS = \ system_main \ thread_main \ time_main \ - timer_main + timer_main \ + traffic_mngr_main noinst_LTLIBRARIES = libtestipsec.la libtestipsec_la_SOURCES = \ @@ -81,6 +81,11 @@ thread_main_SOURCES = thread.c thread_main_LDADD = $(LDADD) $(LIBTHRMASK_COMMON) time_main_SOURCES = time.c timer_main_SOURCES = timer.c +traffic_mngr_main_SOURCES = traffic_mngr.c +traffic_mngr_main_LDADD = $(LDADD) -lm + +dist_check_SCRIPTS = traffic_mngr.sh +test_SCRIPTS = $(dist_check_SCRIPTS) classification_main_SOURCES = \ classification_basic.c \ @@ -92,6 +97,7 @@ classification_main_SOURCES = \ classification.h TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TEST_EXTENSIONS = .sh TESTS = \ atomic_main$(EXEEXT) \ @@ -123,7 +129,7 @@ TESTS = \ thread_main$(EXEEXT) \ time_main$(EXEEXT) \ timer_main$(EXEEXT) \ - traffic_mngr/traffic_mngr.sh + traffic_mngr.sh TESTNAME = validation diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr.c similarity index 100% rename from test/validation/api/traffic_mngr/traffic_mngr.c rename to test/validation/api/traffic_mngr.c diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr.sh similarity index 90% rename from test/validation/api/traffic_mngr/traffic_mngr.sh rename to test/validation/api/traffic_mngr.sh index c88aa805c..0b5f3a03b 100755 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr.sh @@ -12,8 +12,8 @@ # -in the validation when running standalone (./traffic_mngr) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/traffic_mngr:$PATH -PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH +PATH=${TEST_DIR}/api:$PATH +PATH=$(dirname $0)/../../../../validation/api:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore deleted file mode 100644 index efd07a27d..000000000 --- a/test/validation/api/traffic_mngr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -traffic_mngr_main diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am deleted file mode 100644 index a9b8550d7..000000000 --- a/test/validation/api/traffic_mngr/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include ../Makefile.inc - -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - -test_PROGRAMS = traffic_mngr_main -traffic_mngr_main_SOURCES = traffic_mngr.c -LDADD += -lm - -dist_check_SCRIPTS = traffic_mngr.sh -test_SCRIPTS = $(dist_check_SCRIPTS) From patchwork Thu Feb 22 11:00:08 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: 129196 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp467223lja; Thu, 22 Feb 2018 03:03:14 -0800 (PST) X-Google-Smtp-Source: AG47ELuDdhgAjYR26/ipJideKkXptSC7sO5pBLNu/HvwKhfD9D09Ju5IS4kexxTK2REi2vVzPCQG X-Received: by 10.55.77.77 with SMTP id a74mr9554762qkb.239.1519297394739; Thu, 22 Feb 2018 03:03:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297394; cv=none; d=google.com; s=arc-20160816; b=rad3+EeYKgtxmDc0OYutRnV4jzbDCx901m9cylXenxB06q2MbE9vvNV6o+kozcCnSj FfcGgee/wNtLO2+pEE7tLnMWg/j4Gj/cLVjUQ1/OpNgjE5+9IstDxIR31TwjMrGpspfQ SKvEQFir+77N29lkSz8POy4X34ALk3cOCugaFox4pzQ1vl+A4TNxDnD3p5OiI60CvEMq vhVtYuDlMKt4xBN1BIBNS+6CniLyVB+m0OoukC5xpZo155hm7v6YEw2w1tCYbX68Qgfg TLTMkfcDL+cvKQ9vN4gMU6qHcnAvfOACXLEX2KhJ0qVUmIjhBuvtXM65yHEFAbTAiAzg V+uA== 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=btH9l4lkvLd536eGWk+MB8WmpvoCXg+WVH96wiaHetQ=; b=Bpkhubo4iVA5Qj93SB47O8OYqu+3VCh5Rx5OqCXjhJWjyr7P0VRU094k8RFb0NeuI9 6SjWVcEtGuO+5MZj4isoKTtVOoyb8tod/cT/BIFn1+XLrA0yafI5HgenTfM2uABVvERU PEvix/6G8RxhHGjTlO+DcESv4J20kMV04ozYITws1sXHb/TuINNgy9mTSkCa8idzwJwU ukrLYOYR+3jzdBPOf7fRcm3NtqarTByryIeSQDu/b1OpyG3SBW7rt0W1xsNM1I0BfwHG S26mjmdWbjN61UQ3jDLAK+8N4kTxKTrRLcjb/oyDBtnXIOF1f/QEBWV1Wr1HQHFumGTI KyeQ== 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 y84si1161345qkb.103.2018.02.22.03.03.14; Thu, 22 Feb 2018 03:03:14 -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 56673617A1; Thu, 22 Feb 2018 11:03:14 +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 B218461753; Thu, 22 Feb 2018 11:00:43 +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 50E1861748; Thu, 22 Feb 2018 11:00:26 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id DB7E0616FF for ; Thu, 22 Feb 2018 11:00:20 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward100o.mail.yandex.net (Yandex) with ESMTP id D65D72A22B03 for ; Thu, 22 Feb 2018 14:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id TD12ERvX6g-0IdKVTev; Thu, 22 Feb 2018 14:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0IYGLBfm; Thu, 22 Feb 2018 14:00:18 +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: Thu, 22 Feb 2018 14:00:08 +0300 Message-Id: <1519297209-16246-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 7/8] validation: move pktio test to api/ 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ platform/linux-generic/test/validation/api/pktio/pktio_run.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh | 4 ++-- test/m4/configure.m4 | 3 +-- test/validation/api/.gitignore | 1 + test/validation/api/Makefile.am | 5 ++--- test/validation/api/{pktio => }/pktio.c | 2 +- test/validation/api/pktio/.gitignore | 1 - test/validation/api/pktio/Makefile.am | 4 ---- test/validation/api/{pktio/parser.c => pktio_parser.c} | 2 +- test/validation/api/{pktio/parser.h => pktio_parser.h} | 0 13 files changed, 16 insertions(+), 22 deletions(-) rename test/validation/api/{pktio => }/pktio.c (99%) delete mode 100644 test/validation/api/pktio/.gitignore delete mode 100644 test/validation/api/pktio/Makefile.am rename test/validation/api/{pktio/parser.c => pktio_parser.c} (99%) rename test/validation/api/{pktio/parser.h => pktio_parser.h} (100%) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh index 5b861bbbf..76c12b901 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 24194cbc9..730cdbca1 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh index 610be3bdc..e0a19caea 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index 5ab45094a..247854796 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh index ecfe5a126..3aae928c5 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh @@ -16,9 +16,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 18c71d799..52e9317d5 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -7,5 +7,4 @@ AC_CONFIG_FILES([test/Makefile test/miscellaneous/Makefile test/performance/Makefile test/validation/Makefile - test/validation/api/Makefile - test/validation/api/pktio/Makefile]) + test/validation/api/Makefile]) diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index f6bf6e54b..50a76a3b9 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -20,6 +20,7 @@ ipsec_inline_out ipsec_sync lock_main packet_main +pktio_main pool_main queue_main random_main diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 0b6547b5e..6a0176893 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,6 +1,3 @@ -ODP_MODULES = \ - pktio - SUBDIRS = $(ODP_MODULES) include Makefile.inc @@ -25,6 +22,7 @@ test_PROGRAMS = \ ipsec_sync \ lock_main \ packet_main \ + pktio_main \ pool_main \ queue_main \ random_main \ @@ -70,6 +68,7 @@ ipsec_inline_out_SOURCES = ipsec_inline_out.c ipsec_inline_out_LDADD = $(LDADD) libtestipsec.la lock_main_SOURCES = lock.c packet_main_SOURCES = packet.c +pktio_main_SOURCES = pktio.c pktio_parser.c pktio_parser.h pool_main_SOURCES = pool.c queue_main_SOURCES = queue.c random_main_SOURCES = random.c diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio.c similarity index 99% rename from test/validation/api/pktio/pktio.c rename to test/validation/api/pktio.c index a0496642f..3516d6f4a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio.c @@ -12,7 +12,7 @@ #include #include -#include "parser.h" +#include "pktio_parser.h" #define PKT_BUF_NUM 32 #define PKT_BUF_SIZE (9 * 1024) diff --git a/test/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore deleted file mode 100644 index 1a5dd46e4..000000000 --- a/test/validation/api/pktio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pktio_main diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am deleted file mode 100644 index ffd1827be..000000000 --- a/test/validation/api/pktio/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = pktio_main -pktio_main_SOURCES = pktio.c parser.c parser.h diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio_parser.c similarity index 99% rename from test/validation/api/pktio/parser.c rename to test/validation/api/pktio_parser.c index e0431441f..a998981e0 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio_parser.c @@ -13,7 +13,7 @@ #include #include -#include "parser.h" +#include "pktio_parser.h" #define MAX_NUM_IFACES 2 #define PKT_POOL_NUM 256 diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio_parser.h similarity index 100% rename from test/validation/api/pktio/parser.h rename to test/validation/api/pktio_parser.h From patchwork Thu Feb 22 11:00:09 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: 129202 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp478268lja; Thu, 22 Feb 2018 03:15:37 -0800 (PST) X-Google-Smtp-Source: AH8x224+kU5S6cvG5f0E5oqETty5tVF9UZH5LLXrHZKWxweWN/S9OHvXbcwjxt3Ry441lQaNRmXb X-Received: by 10.55.21.212 with SMTP id 81mr9856123qkv.280.1519298136965; Thu, 22 Feb 2018 03:15:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519298136; cv=none; d=google.com; s=arc-20160816; b=ih6WyMCS2JJvZA9tNveqny8uEAW5hVNvhmScLiNr8D5PB+NrLeW7rueZYn3kd+XkSv eP9o67B52jGzDP6j/EsqlvKxb9zhWyavB6qj8udvxZEPumJH1jViMf4nHVbHm+Hc+X03 dvf6nXEKdkITkvr+76N9WgRk0y1PFgx0gMJ8+D4cNab5PzJTNRCCAxshgjvaBwu+TT0W fpxwd4Vjs4g34U4hPnNqF78GlVR3rDh4lckisnDg/cZfIvTsipBUY6ivFGoxasXdAM4l H6JVBZb0I5V4gx4XZyWsNOAlfQMudfAhs6rtJY9GgeJ77Hl+GUuENX79//nvvMpfYGYv G6Eg== 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=O7QajFc+Xk49KtVEBJz1f5/KSrGUWerhP2JIwI2mUZw=; b=n2KWN7vWB+1QhDwmeh2vVBu4SWuWV+lxZF6L6f7SdgCKAYKV0bHjCnTOPG3cRq4Crg N9R5P6/nfz09GpPHDtBgXy6xJ7OjwUm1rN/ilLzJTvEQjIhXz2YVuCMoiCR14sW/Dxdf ISQ9xK7ZSbyN5Rf8z8XP6aTETmseEEO3pSZDRwTjM0R4Wyvw6pQtS+Y4yiDrHRF4oRXJ 9xUG/rwXKV8cYi7Xst0HS7oMawljpARRVLvqLkaBEGFlKVAk8r+H6Epoly6+2HBWX12V EBfBQQt+qNf+4AZ0doAbXQYeLr4t2ayBKpI2ua0/ieaH/6voNn4Cx26fGV8+YpR/F8qe 6DZg== 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 a6si2151703qte.291.2018.02.22.03.15.36; Thu, 22 Feb 2018 03:15:36 -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 8BB3160675; Thu, 22 Feb 2018 11:15:36 +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 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 2039960718; Thu, 22 Feb 2018 11:05:30 +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 D082861761; Thu, 22 Feb 2018 11:05:13 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id C168361762 for ; Thu, 22 Feb 2018 11:02:12 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward104p.mail.yandex.net (Yandex) with ESMTP id A98B018619A for ; Thu, 22 Feb 2018 14:00:19 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id b2nDF6o5Kd-0JbK652U; Thu, 22 Feb 2018 14:00:19 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0IYW52kM; Thu, 22 Feb 2018 14:00:18 +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: Thu, 22 Feb 2018 14:00:09 +0300 Message-Id: <1519297209-16246-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 8/8] linux-gen: move pktio test to api/ 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov 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: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ platform/linux-generic/m4/configure.m4 | 2 +- platform/linux-generic/test/Makefile.am | 16 ++++++---------- .../test/validation/api/{pktio => }/Makefile.am | 0 .../test/validation/api/{pktio => }/pktio_env | 0 .../test/validation/api/{pktio => }/pktio_run.sh | 0 .../test/validation/api/{pktio => }/pktio_run_dpdk.sh | 0 .../test/validation/api/{pktio => }/pktio_run_netmap.sh | 0 .../test/validation/api/{pktio => }/pktio_run_pcap.sh | 0 .../test/validation/api/{pktio => }/pktio_run_tap.sh | 0 test/performance/odp_l2fwd_run.sh | 4 ++-- 10 files changed, 9 insertions(+), 13 deletions(-) rename platform/linux-generic/test/validation/api/{pktio => }/Makefile.am (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_env (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_dpdk.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_netmap.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_pcap.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_tap.sh (100%) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7fa3652e2..544a02861 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -20,7 +20,7 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile - platform/linux-generic/test/validation/api/pktio/Makefile + platform/linux-generic/test/validation/api/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile platform/linux-generic/test/pktio_ipc/Makefile platform/linux-generic/test/ring/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 99934099a..06c06c7e8 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -4,35 +4,31 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance if test_vald -TESTS = validation/api/pktio/pktio_run.sh \ - validation/api/pktio/pktio_run_tap.sh \ +TESTS = validation/api/pktio_run.sh \ + validation/api/pktio_run_tap.sh \ validation/api/shmem/shmem_linux$(EXEEXT) -SUBDIRS += validation/api/pktio\ +SUBDIRS += validation/api\ validation/api/shmem\ mmap_vlan_ins\ pktio_ipc\ ring if HAVE_PCAP -TESTS += validation/api/pktio/pktio_run_pcap.sh +TESTS += validation/api/pktio_run_pcap.sh TESTS += mmap_vlan_ins/mmap_vlan_ins.sh SUBDIRS += mmap_vlan_ins endif if netmap_support -TESTS += validation/api/pktio/pktio_run_netmap.sh +TESTS += validation/api/pktio_run_netmap.sh endif if PKTIO_DPDK -TESTS += validation/api/pktio/pktio_run_dpdk.sh +TESTS += validation/api/pktio_run_dpdk.sh endif TESTS += pktio_ipc/pktio_ipc_run.sh SUBDIRS += pktio_ipc else -#performance tests refer to pktio_env -if test_perf -SUBDIRS += validation/api/pktio -endif endif TEST_EXTENSIONS = .sh diff --git a/platform/linux-generic/test/validation/api/pktio/Makefile.am b/platform/linux-generic/test/validation/api/Makefile.am similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/Makefile.am rename to platform/linux-generic/test/validation/api/Makefile.am diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_env b/platform/linux-generic/test/validation/api/pktio_env similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_env rename to platform/linux-generic/test/validation/api/pktio_env diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio_run.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run.sh rename to platform/linux-generic/test/validation/api/pktio_run.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio_run_dpdk.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh rename to platform/linux-generic/test/validation/api/pktio_run_dpdk.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio_run_netmap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh rename to platform/linux-generic/test/validation/api/pktio_run_netmap.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio_run_pcap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh rename to platform/linux-generic/test/validation/api/pktio_run_pcap.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio_run_tap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh rename to platform/linux-generic/test/validation/api/pktio_run_tap.sh diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index 0cb293dc8..96930f6c6 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -42,8 +42,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 ${PLATFORM_VALIDATION}/api/pktio/pktio_env ]; then - . ${PLATFORM_VALIDATION}/api/pktio/pktio_env +elif [ -f ${PLATFORM_VALIDATION}/api/pktio_env ]; then + . ${PLATFORM_VALIDATION}/api/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."