From patchwork Thu Feb 22 10: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: 129183 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp431643lja; Thu, 22 Feb 2018 02:17:17 -0800 (PST) X-Google-Smtp-Source: AH8x225QC1RQZ5XJJIvHtVQjVtHU4LEFg3d3v6eTnHopcY6kbIdOMzrA0QtvfkmOXf1Axx6fXzdF X-Received: by 10.55.42.1 with SMTP id q1mr9885825qkh.282.1519294636993; Thu, 22 Feb 2018 02:17:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519294636; cv=none; d=google.com; s=arc-20160816; b=SoQ/na6LeBgsbyNkwvfitg1S84EztC97umDNrzlPSlRochEhIyLf7fo4IgDHwv0lD2 2UvQKF634GUopaD++6Y7y58nlGfdRdkFwQNr9SOxxSZCVWAbtdhQrWvnIAsl6waVstv1 s0V3i5Z4vZxuf7qBkZ99xifVi1NujLmjYzUKIWTe+zc+5b5vSATvRtN08MVwpElpmMMw X88DMSeBrFL36hJkT08nz9eVmAX2KFdZhuZtjflda5fQZKB+kEl4HCY63T1e3S86cZdL ALZLLs6z0OmkrxZ3GfXDYjqXT6junst1LMtAaVFEUlEQbNqpA6xdLSQdyIplsCJqyET2 QNFw== 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=7wFO22rO5QLYxbm9XP6lrKmUaKI1rYpPXvLbCFSCazE=; b=Xap2L8rHhwZKpEsF/afqP3y3hwj66G9Etd3Qf3MPpSEblMaPrFmGUCISRxq7/N8xzm +zQJIp71uNyKbMFo+nMv12aoUkfWBZwI6F9PKpT8vVeYxFFyhjsZNtSYtPHJhVQyhv+C sGhaRsg1GTm/9v4xDom1sAbhaY5ZOreHNWtNZyoXcTjfrmJAR2JGjw0wbnnvqQeHhRP+ aqn8wxWbBD/CzlqJNnRwoGWazuLHt1wtsw9Jf4zg/g09BIrNbpzCIYQHo//JT58ruKKS E/zCDyt/wXI1BrWGAoL3pLjlqK2y2rcV5UC4TpG5oHYdOJALk9eAn89/Jb1EWMR61pbU ZKLQ== 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 l12si1806965qtb.446.2018.02.22.02.17.16; Thu, 22 Feb 2018 02:17:16 -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 A6F84617A1; Thu, 22 Feb 2018 10:17:16 +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 34845617F6; Thu, 22 Feb 2018 10:05:07 +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 C8C18617F6; Thu, 22 Feb 2018 10:04:49 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 887CF61727 for ; Thu, 22 Feb 2018 10:01:18 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 9CD5C1821A3 for ; Thu, 22 Feb 2018 13:00:10 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id loVlDIrRbg-0AbqFxhV; Thu, 22 Feb 2018 13:00:10 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-09YqKVQl; Thu, 22 Feb 2018 13:00:09 +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 13:00:02 +0300 Message-Id: <1519293608-14576-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 1/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 10: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: 129173 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp417397lja; Thu, 22 Feb 2018 02:01:29 -0800 (PST) X-Google-Smtp-Source: AG47ELu7Ty4+65dvsocX9xlmZTGJDmbBUktowPdXyhTv+q/oaJzKU+MbIJZ/bFw9rMb03V9zDhiR X-Received: by 10.55.170.209 with SMTP id t200mr9987373qke.228.1519293689804; Thu, 22 Feb 2018 02:01:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519293689; cv=none; d=google.com; s=arc-20160816; b=vJfzu0IMum6KIJ8d0ahrmXkDFiyJEmF+fUelbh/a5q442YQ4DU1vuvlUZ58/6e6sX7 onzC26Gf+zbPb42jU9fsXJAr/+7O4zUrZyU1TepWl1CFzYGK2Z0fQkPS8OLuk9QJQCdg jpuuAsgh8Zif8MXjq8USMn1gAyxOfNF+OVmLxrgybupwku9ivB5mtNS75xveeFKzjWnz gPyrFs12OF/vfjzjqtH9u7i987KhFUR9zOY8iEzeE1Bfq1uxL/awV205S1yIUTNwGIbA 6Ni0fBcHemKk6Bb2znhqkPIvcX+d2um9tr/EAyxnDA41XRi0PwCmdrvYgmIIfhMmBJlN 3+qg== 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=OVn0ppMYFX0Yu1BcgMyB7y4BXmRul0uW+fGURGVHhX8=; b=sC+euVgZ2JnNLrdZkOHiZLpQB4UpOB/JWmVR4pEfHq4FjrVt8koURVdeLjrPboyk78 SAcQwyUrzOjUokNgdFJox2tJvcGTDl+QxLqNixLO9fArDAyRdHCqzcR+jMzfeh8pk3hg uXgsbkiqNNztHm1dkvbvOBENl2XXIU+yrK+rrUlH7H4fGfhDPrqrh0ZTeYklqW9BVoyG fLDoadR6CFOC5XfnTBJundjDwO9koODjWherg0V45Krq+sB0QF4heALxd1hRr3KzfezF iRPRWD3u6n0l2rF8SuvtRN1GLVL/uaF3pVkH4qMVgZnoZUWIbxT/4OQCkW67/4WOjr+V YBNQ== 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 o65si1935868qka.412.2018.02.22.02.01.29; Thu, 22 Feb 2018 02:01:29 -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 45AC56173A; Thu, 22 Feb 2018 10:01:29 +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 4450E6077E; Thu, 22 Feb 2018 10:00:31 +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 EE61060ABA; Thu, 22 Feb 2018 10:00:17 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id B667060ABA for ; Thu, 22 Feb 2018 10:00:12 +0000 (UTC) Received: from mxback17j.mail.yandex.net (mxback17j.mail.yandex.net [IPv6:2a02:6b8:0:1619::93]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 53E8945E77 for ; Thu, 22 Feb 2018 13:00:11 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback17j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id jSZekFn06Y-0BHSAVJG; Thu, 22 Feb 2018 13:00:11 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0AY4iBY0; Thu, 22 Feb 2018 13: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 13:00:03 +0300 Message-Id: <1519293608-14576-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 2/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 10: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: 129171 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp416176lja; Thu, 22 Feb 2018 02:00:30 -0800 (PST) X-Google-Smtp-Source: AG47ELsp5CwePsIsDhImYZG13KjqTGPZGq0dISebVMzPiItPKJAU7/UKVG4S1jRafFLNaxTf8VCJ X-Received: by 10.55.34.197 with SMTP id i188mr10107261qki.180.1519293630493; Thu, 22 Feb 2018 02:00:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519293630; cv=none; d=google.com; s=arc-20160816; b=jAcb8syoHzAaZ5eiTNT37OwiGaa5TDMyVihpwolardQ9eSHoyPw+lCjDkVq9cQ9ery NqLgSXSzjp0CK0voJ8KSgiwGH6bfbeRBuqTDQpHeVHSKNnAzv86NVngUQV9syXRcXSmJ 37kMuivUbfBQzxJS0ACyvEvS8Quw8vz/SPEfLFPLwfDo2qw6M94qSnep/YHFVMfvbSUZ hGSv46BUWWOmkjo5Pf3HtBtA0ypheoBpI6b9ScnbtTZhuKDlMUsqY7ItmEPEtyNP6isX /IfPdu18hJo/Ii/sVqHD9W+h9pOcaC1MpROJfxtgT0KAbBmypr6ZvnW3e14ndEbXHZoN 6JKQ== 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=8PnvrG3E2qfHtmYzCKhffha94F83zZS24nV5psiNZKg=; b=L+tR7u0Kva2OszUAt52Ko8HsTyJtpJ/j9TDbP1aPzXqm1XBIb3tPbEN46Xr6nIRCzK TrkJeuzLBpj9kWLaWkWmT9yxbi+EHxdwbT9wx5WvO0AbbDPShd3Bh3OGCQY+nj1Ddv23 6ky83ndlI9VXx5NaMhO3Q3Y/yBGiNxqmmLASamrry2PtI8zQzXckEN/3tUDWSmMqgvg/ 5hQqKF9N5kZM29xDuDfM296cyI3fACNYe+b1BhAF8mgc3FGnqtfK/6V8fWc5+cO0XeDW I/udHDHRdK8pVKXG1JcWwlC65yXvIJk/FLk99+V/IZX8azhkKd+4EnMK4j+4XRStFjFF ssaA== 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 h124si590756qkd.396.2018.02.22.02.00.29; Thu, 22 Feb 2018 02:00:30 -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 217CA6066F; Thu, 22 Feb 2018 10:00:29 +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 D356B61727; Thu, 22 Feb 2018 10:00:20 +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 31C6661727; Thu, 22 Feb 2018 10:00:17 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 3AF1561702 for ; Thu, 22 Feb 2018 10:00:13 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 30A9F416A6 for ; Thu, 22 Feb 2018 13:00:12 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BdjXXQ1Y52-0CM0Mpj3; Thu, 22 Feb 2018 13:00:12 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0BYC2Rnp; Thu, 22 Feb 2018 13: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 13:00:04 +0300 Message-Id: <1519293608-14576-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 3/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 10: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: 129184 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp432399lja; Thu, 22 Feb 2018 02:18:12 -0800 (PST) X-Google-Smtp-Source: AH8x225v5rsd4hLPVEA0aIg9HAmOuXvKCgGE+JRH8u/Hgs4+1tDxMDlRNRfZeCd/eHF7PpuK2FiR X-Received: by 10.55.160.129 with SMTP id j123mr9517983qke.319.1519294691939; Thu, 22 Feb 2018 02:18:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519294691; cv=none; d=google.com; s=arc-20160816; b=jgSmyjRFHHR/Jqp9ZxbTEO1Yf3YdOnk/phP75oIdEKZ0bwHlB4M9yvDv7f6sq/G9RT FSwc6HaDBWIpj1DZzNVTLAHEzasU/kFUM7r6kvgp921Yj0uMDKRk3jul9pCfTgFHJEAg 6NagHf8ZWB1gwQiOrVDqGQLh2iNeK/R7PvNGjhDb+lj3nh7FmisI5S5+j/oMPzMX1nEj g0Dn+02FshYjk8G9Y6LsMcbbLPfx/yjcvhsIcjltASjGhjuFko3/fMFOjazy9WTdgLL9 DY7CUPNshn9JFyVOsr6pBxb1D/kcGZo2PaTpMePzhNjHc3GLvFChny7Pu/hip8XhFFA/ xPsg== 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=LYrxvY2Xmgt6dHEd8KMOcV4juO+xGn++/bJ/+bZebDw=; b=QaO0Aebekp4KR+hWi3JF5Lm4olzzqIihqFyzhld1dxJYDoF1/2d7YFaFf9A9i4O6CA j1knI2wXNgNeDRdx/dqH87YxyGwViwtDbZUqJ9FdHXVgGEHzJIda7+leb7P/va7/T6fp nnzyGNfafm+p3sjZKjaFY26P2PCw1w3SrEP+liCadc5+q3OUyeAgWd1icTyrI4+PdL4/ rJk5lX7AeBnvBE7OA7LhMXp1hiqnXd1DcRakfnbp/pTOktA7fXtkJ+2gllNSMpXjs0VW h9YN7g4NtKQIiuM3yprn3vY7uywqLTrfprAyosoyRX6o3y5TTM1lvIOEaHU45hvbJDQR J4MA== 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 f43si2012270qta.225.2018.02.22.02.18.11; Thu, 22 Feb 2018 02:18:11 -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 958B1617D5; Thu, 22 Feb 2018 10:18:11 +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 10D90609D9; Thu, 22 Feb 2018 10:05:34 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EC48A6182B; Thu, 22 Feb 2018 10:05:16 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id BE27C6172A for ; Thu, 22 Feb 2018 10:01:20 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 1D87D185A25 for ; Thu, 22 Feb 2018 13:00:13 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YYfFQDkZkA-0CIuHNRa; Thu, 22 Feb 2018 13:00:13 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0CYOxUvJ; Thu, 22 Feb 2018 13: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 13:00:05 +0300 Message-Id: <1519293608-14576-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 4/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 10: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: 129175 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp419488lja; Thu, 22 Feb 2018 02:03:35 -0800 (PST) X-Google-Smtp-Source: AG47ELuwBiuOk70fhQDOn+L44JGAz07Sdafdvsf5y/7Dg8zeqXbRby47HY0ne4t1FuRbtD7zgwq/ X-Received: by 10.55.91.70 with SMTP id p67mr9327794qkb.243.1519293815467; Thu, 22 Feb 2018 02:03:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519293815; cv=none; d=google.com; s=arc-20160816; b=jErMQ0G9X6v0JlFiUTcsU8RS+y/L/kdtpsDhpD0vfy+2czFPaPdKdlIJLCTmtJJ4/u w/l5cTDr/C67mO+dHIW/uX2pFL8TAO7+RsQ2Cz4sN2RKhowFrchcZzdMltfY64YdcbsN 1thQ9B99vFr4QtgW0BsKbY172kamSYv7TXpJb+qF7a0QRfvFes4ai4k9t4DXBB7/S/D0 3eWr90aUxWV94WNA5lRnAcw4z0BEYb4ui1dg9dSH7rUqZyPGRmTEKfcck+3NarEVHNUm eHNzVt9j4T2gpyAJGY3zd7x+J3/3kerewjvFWDoovhf+p/okH5FT02BjELysv/13IoBZ H+tg== 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=ruZfmNwX5gicR3J/DWj7SofR1kObMn8deorwH0bbZhk=; b=ovMY5wFFbeckgo1IESoOomMwGpREWaUYTLXcDumjugy/RiY5TMBe+liDrNFhu6PBZ+ VmsXn9uQBbYzDSobw1eleAtdorgO+3XWfPWy6t8365N/uzpHteBgrWBlRXu89oTXhjD3 DC0JDD/aSJ5NuD1yD7QOLZNEMWVmYZLFZl1EIWv4YwXvSF02N+m1FiDxvKGtoWf+2ceR Dn/lUrweWFunl+kCSIlHvXZJI0pAgD2aBst5TbVzf4Bu0F40E7EnaHXG/m/bJbh+nvKo lo6pwVoCEXijauJ4roU2q3WeNw6Parj+8m5X4FcMBWBAyShz+b+heu00XmCnTb1owbnz +cfA== 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 188si354524qkm.370.2018.02.22.02.03.35; Thu, 22 Feb 2018 02:03: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 10866617A1; Thu, 22 Feb 2018 10:03:35 +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 0132D60B52; Thu, 22 Feb 2018 10:00:50 +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 77FDC61737; Thu, 22 Feb 2018 10:00:26 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 88C166170B for ; Thu, 22 Feb 2018 10:00:16 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 14862701157 for ; Thu, 22 Feb 2018 13:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id NjLnQXqc1e-0FBaGM3T; Thu, 22 Feb 2018 13:00:15 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0DYG5iEn; Thu, 22 Feb 2018 13: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 13:00:06 +0300 Message-Id: <1519293608-14576-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 5/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ test/m4/configure.m4 | 24 --- test/validation/api/.gitignore | 29 ++++ test/validation/api/Makefile.am | 173 ++++++++++++++------- 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 => }/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 - 91 files changed, 223 insertions(+), 302 deletions(-) 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%) 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/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..bc3a429d2 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,66 +1,127 @@ -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 + +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/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 10: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: 129174 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp418346lja; Thu, 22 Feb 2018 02:02:23 -0800 (PST) X-Google-Smtp-Source: AH8x227lJugni/a6lsSsXHMT418oYRqrvvbOwpAbeoBF6dO3xflGOgjkEJFhSkc15zmHE531tVVr X-Received: by 10.237.41.194 with SMTP id o60mr10350735qtd.128.1519293743237; Thu, 22 Feb 2018 02:02:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519293743; cv=none; d=google.com; s=arc-20160816; b=Egd+duDkfXiv7H+GREij36LVKzo4BkKrJ+kypQH8e8Jwx6EHBlMJfsUkGQW9jkYEAh aMAGDC1iUvw80ReKeFRTFrEUAyQa4FFEhuyb/mrny3J43qwkkLNpWnZZx9N7yxZxFtVu fe1RVuf/Lh0g9Q4nURxtPhTtOQuU4O20NbSxEGSAr6Tt6JmRJIssFEP/wI5bZha7iPgq R7oPtOyaCCF45V4aj3HVuLKrNNS9ZXin77OsDTBux6J6vL7gjF2yYAMY8ODLPVPcUVXT o5t2ZI2taHmJkTZkoImZhajV9UkymTfop7Yk5GE+VxLRtY/PYW8lWZQFsgaP+L9klDoe 7dbA== 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=mjULh3MAwmhCVoUUIYTdELE9GIvE2cgbEqNp+TA/kxw=; b=oXSVHw+UyYitKnR0lNJl8rcw4dWPKt4xCsZo8v8JcobphNXXzDzklQZe6MBEBiroWH OwBgVpxOp1WNrnT3aHdoEVeExryZLndiNgM1xQldvLmTw6z6cASjcD0NOy8WhOlrwEFu VnLlmSWMCsJ71RAhqkgVtv/9dpRK1xqOarrLXpF/4hqZ/1H0DzrFeu46nhXOxAkSbUsR ZDPjkDKCSEErvK0dP2N66IoOWnjZqvIRIrW2BfRD4zmt5tg1WQMIDUizn6U6ZDs33Yqn LxQcz6LY6b+Sqhn6eoR6w1dltYQp6boSpoSbLFfyCA81f0V4rEoJVjy5UoXRYIUTdyH+ xhZQ== 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 k24si6546277qkl.389.2018.02.22.02.02.22; Thu, 22 Feb 2018 02:02:23 -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 D8E2F61784; Thu, 22 Feb 2018 10:02:22 +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 709BE60896; Thu, 22 Feb 2018 10:00:37 +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 0861361739; Thu, 22 Feb 2018 10:00:25 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 7BF1161702 for ; Thu, 22 Feb 2018 10:00:17 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward102o.mail.yandex.net (Yandex) with ESMTP id DBEC55A0449B for ; Thu, 22 Feb 2018 13:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id nVDUhYjcyb-0Fsup76V; Thu, 22 Feb 2018 13:00:15 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0FY4rW9E; Thu, 22 Feb 2018 13: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 13:00:07 +0300 Message-Id: <1519293608-14576-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 6/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 bc3a429d2..b45828c54 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 = \ @@ -79,6 +79,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 \ @@ -90,6 +95,7 @@ classification_main_SOURCES = \ classification.h TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TEST_EXTENSIONS = .sh TESTS = \ atomic_main$(EXEEXT) \ @@ -121,7 +127,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 10: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: 129176 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp422351lja; Thu, 22 Feb 2018 02:06:41 -0800 (PST) X-Google-Smtp-Source: AG47ELtN8FOpaKpOpgPG/SGQh40t3r/XUTsqUIgk361kwtlB9J7k+HO0AI835sNtRuE3KsipSZ5M X-Received: by 10.55.148.6 with SMTP id w6mr53846qkd.293.1519294001710; Thu, 22 Feb 2018 02:06:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519294001; cv=none; d=google.com; s=arc-20160816; b=Do9j17CmtC1Yw4eyfcV2gg17BpSCr6BK4lfxjDx9uuCPchvx+ew1UkLwV9C0SyqnKo f+HFbiEy2o7tYO5pCH3pIjrIkBYlfMVE8Ud3CudBlPkD9wsXnQKaBvWv2L2kTnChH8M/ 6NroaMBj2d08GEG0w3UaUVuqH6o+zOu7HziMwHQvQ152RFWw7E1w6plzvzVPoEsjAGGB PvUk52OxFQAYhegMv2at2rBtkmiUTU2O0WTKeNZ7JnUIqnXspyb9P8ofLDj4a8ax1sH7 XaFeLFlpcg3Fpl1VsAFCz0sclynTM3GZaDXJN2+xv/5XLLfMihbx5IWg027qYzHSp1yT vNGw== 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=w+zAWW3vcYJ+isgAz15qDmWw29ANXOhQ6aznT+Z7c9I=; b=XLyOnKWBv1JZAovEL3QzmKCjj4KA7QIygGQ/0WTIrfHa0Unf1b+BuJP9TBigdc1aKi 1lyOkzj4UToyjxi5dgg3wdPcjBSlBKkf4J+BZNvW4nkQtTV8MRD4xDiilD/qERfE3Flt jXGRmFA0g+Ncrkwex/Gkt4mriIIN66+0tR+ok8yRuAcJ5HHHSziEK1mHmWvYM+IY2vMh OJvIRwmm1YV7ipOutESkLYfkq1mB0Z5bNkzNSJgVKP0Z6No2BzDbHfmGOB+I2+Fl16IE g+k15hv/UU/ija1cblX9aJ3RCAnABcel/iBXM9Ek2mtpqSzC5rETK/XfGLzv3matw59l 6P4Q== 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 t13si2048729qte.397.2018.02.22.02.06.41; Thu, 22 Feb 2018 02:06:41 -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 5BC636182B; Thu, 22 Feb 2018 10:06:41 +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 53EAF61702; Thu, 22 Feb 2018 10:00:56 +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 BAABE61737; Thu, 22 Feb 2018 10:00:27 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id AE61361724 for ; Thu, 22 Feb 2018 10:00:17 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 8B9C85A01FA7 for ; Thu, 22 Feb 2018 13:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zKZAUJYgWO-0GN0DjuO; Thu, 22 Feb 2018 13:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NF3s7Z4AUy-0FYq3rAI; Thu, 22 Feb 2018 13: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 13:00:08 +0300 Message-Id: <1519293608-14576-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> References: <1519293608-14576-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v2 7/7] 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: 99fb903634fa03590985e6eca1ef7e0ba27cb0f1 **/ 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 ++-- 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 12 files changed, 14 insertions(+), 20 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/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 b45828c54..48a78c16e 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 \ @@ -68,6 +66,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