From patchwork Wed Jul 13 19:50:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 71968 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1175240qga; Wed, 13 Jul 2016 12:57:35 -0700 (PDT) X-Received: by 10.200.34.19 with SMTP id o19mr14648680qto.97.1468439855361; Wed, 13 Jul 2016 12:57:35 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 14si2678311qtn.142.2016.07.13.12.57.34; Wed, 13 Jul 2016 12:57:35 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 810C461689; Wed, 13 Jul 2016 19:57:33 +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=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 328D16865E; Wed, 13 Jul 2016 19:51:47 +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 0D0DE684F8; Wed, 13 Jul 2016 19:51:18 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id 572D76746C for ; Wed, 13 Jul 2016 19:51:06 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id f93so47097429lfi.2 for ; Wed, 13 Jul 2016 12:51:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5rp9AGxRP9yasc+hTm7sh4mOeS9YoZvm4hhmQFQ8clI=; b=VqKWNGYQK/CCHMpJWaLuvEoCMRWt2/Omsox9m0krwme/9BlWEDDhhlrCDuKThar919 0y8+we/7/mDv0NEWdV0zL/22GIEFVd/xmbap7vcw+Lg2v2Vbu4V0EiPAncNYoMq2tHyB GXM76RqWbBXG7kqq1ofArnqyE3XQC/WUBysqiOWjHLcEogi4FAI0beTACeA0mQQ+cnaR xdVsMjinehlWEJkXEgD6NiIuKqH30FGdammcDFN9UbOAZSFRlU5t1dVuiuO8YnDyAAct lOfYnl+IAhbNBQBYXZFlqw2I2RD/GF04HsTG7Io65nFxhnW/95dEG/nieD15Wn7+d7du 9eMg== X-Gm-Message-State: ALyK8tLs57n5af05rXeL8n5kjVydRw+QtdCtOKH4c55vUvl05LBmUQ4NL5OyIP7I1WPtttwUqCg= X-Received: by 10.25.207.15 with SMTP id f15mr4717714lfg.108.1468439464253; Wed, 13 Jul 2016 12:51:04 -0700 (PDT) Received: from localhost.localdomain (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by smtp.gmail.com with ESMTPSA id 41sm3202835lft.20.2016.07.13.12.51.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jul 2016 12:51:03 -0700 (PDT) From: Christophe Milard To: mike.holmes@linaro.org, balakrishna.garapati@linaro.org, yi.he@linaro.org, lng-odp@lists.linaro.org, bill.fischofer@linaro.org Date: Wed, 13 Jul 2016 21:50:41 +0200 Message-Id: <1468439443-2849-3-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468439443-2849-1-git-send-email-christophe.milard@linaro.org> References: <1468439443-2849-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv3 2/4] validation: moving api validation tests to prepare for new interfaces 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" API tests are now moved to test/common_plat/validation/api (from test/validation), The reason for this move is two folded: * Moving down validation to all-plaforms/validation disambiguates the meaning of validation (which up to now was referring to both platform agnostic tests and to the set of tests to pass to be ODP compatible). Now things in test/common_plat/ are platform agnostic. So test/common_plat/validation/* are platform agnostic things for the validation tests, as much as test/common_plat/performance are platform agnostic things for the performance tests. * creating the api directory under "validation" simply enable adding other interfaces (such as future drv) as part of the validation tests Signed-off-by: Christophe Milard --- test/Makefile.am | 4 +- test/common_plat/Makefile.am | 7 +++ .../{validation => common_plat}/common/Makefile.am | 0 .../common/mask_common.c | 0 .../common/mask_common.h | 0 .../common/odp_cunit_common.c | 0 .../common/odp_cunit_common.h | 0 test/common_plat/m4/configure.m4 | 33 ++++++++++++++ test/{ => common_plat}/m4/miscellaneous.m4 | 0 test/{ => common_plat}/m4/performance.m4 | 0 test/{ => common_plat}/m4/validation.m4 | 0 test/{ => common_plat}/miscellaneous/.gitignore | 0 test/{ => common_plat}/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{ => common_plat}/performance/.gitignore | 0 test/{ => common_plat}/performance/Makefile.am | 0 test/{ => common_plat}/performance/odp_crypto.c | 0 test/{ => common_plat}/performance/odp_l2fwd.c | 0 .../{ => common_plat}/performance/odp_l2fwd_run.sh | 6 +-- .../{ => common_plat}/performance/odp_pktio_perf.c | 0 .../{ => common_plat}/performance/odp_scheduling.c | 0 .../performance/odp_scheduling_run.sh | 0 test/common_plat/validation/Makefile.am | 3 ++ .../validation/api}/.gitignore | 0 .../validation/api}/Makefile.am | 2 +- .../validation/api}/Makefile.inc | 4 +- .../validation/api}/README | 0 .../validation/api}/atomic/.gitignore | 0 .../validation/api}/atomic/Makefile.am | 0 .../validation/api}/atomic/atomic.c | 0 .../validation/api}/atomic/atomic.h | 0 .../validation/api}/atomic/atomic_main.c | 0 .../validation/api}/barrier/.gitignore | 0 .../validation/api}/barrier/Makefile.am | 0 .../validation/api}/barrier/barrier.c | 0 .../validation/api}/barrier/barrier.h | 0 .../validation/api}/barrier/barrier_main.c | 0 .../validation/api}/buffer/.gitignore | 0 .../validation/api}/buffer/Makefile.am | 0 .../validation/api}/buffer/buffer.c | 0 .../validation/api}/buffer/buffer.h | 0 .../validation/api}/buffer/buffer_main.c | 0 .../validation/api}/classification/.gitignore | 0 .../validation/api}/classification/Makefile.am | 0 .../api}/classification/classification.c | 0 .../api}/classification/classification.h | 0 .../api}/classification/classification_main.c | 0 .../api}/classification/odp_classification_basic.c | 0 .../classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 0 .../api}/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api}/cpumask/.gitignore | 0 .../validation/api}/cpumask/Makefile.am | 0 .../validation/api}/cpumask/cpumask.c | 0 .../validation/api}/cpumask/cpumask.h | 0 .../validation/api}/cpumask/cpumask_main.c | 0 .../validation/api}/crypto/.gitignore | 0 .../validation/api}/crypto/Makefile.am | 0 .../validation/api}/crypto/crypto.c | 0 .../validation/api}/crypto/crypto.h | 0 .../validation/api}/crypto/crypto_main.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.h | 0 .../validation/api}/crypto/test_vectors.h | 0 .../validation/api}/crypto/test_vectors_len.h | 0 .../validation/api}/errno/.gitignore | 0 .../validation/api}/errno/Makefile.am | 0 .../validation/api}/errno/errno.c | 0 .../validation/api}/errno/errno.h | 0 .../validation/api}/errno/errno_main.c | 0 .../validation/api}/hash/.gitignore | 0 .../validation/api}/hash/Makefile.am | 0 .../validation/api}/hash/hash.c | 0 .../validation/api}/hash/hash.h | 0 .../validation/api}/hash/hash_main.c | 0 .../validation/api}/init/.gitignore | 0 .../validation/api}/init/Makefile.am | 0 .../validation/api}/init/init.c | 0 .../validation/api}/init/init.h | 0 .../validation/api}/init/init_main_abort.c | 0 .../validation/api}/init/init_main_log.c | 0 .../validation/api}/init/init_main_ok.c | 0 .../validation/api}/lock/.gitignore | 0 .../validation/api}/lock/Makefile.am | 0 .../validation/api}/lock/lock.c | 0 .../validation/api}/lock/lock.h | 0 .../validation/api}/lock/lock_main.c | 0 .../validation/api}/packet/.gitignore | 0 .../validation/api}/packet/Makefile.am | 0 .../validation/api}/packet/packet.c | 0 .../validation/api}/packet/packet.h | 0 .../validation/api}/packet/packet_main.c | 0 .../validation/api}/pktio/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio.c | 0 .../validation/api}/pktio/pktio.h | 0 .../validation/api}/pktio/pktio_main.c | 0 .../validation/api}/pool/.gitignore | 0 .../validation/api}/pool/Makefile.am | 0 .../validation/api}/pool/pool.c | 0 .../validation/api}/pool/pool.h | 0 .../validation/api}/pool/pool_main.c | 0 .../validation/api}/queue/.gitignore | 0 .../validation/api}/queue/Makefile.am | 0 .../validation/api}/queue/queue.c | 0 .../validation/api}/queue/queue.h | 0 .../validation/api}/queue/queue_main.c | 0 .../validation/api}/random/.gitignore | 0 .../validation/api}/random/Makefile.am | 0 .../validation/api}/random/random.c | 0 .../validation/api}/random/random.h | 0 .../validation/api}/random/random_main.c | 0 .../validation/api}/scheduler/.gitignore | 0 .../validation/api}/scheduler/Makefile.am | 0 .../validation/api}/scheduler/scheduler.c | 0 .../validation/api}/scheduler/scheduler.h | 0 .../validation/api}/scheduler/scheduler_main.c | 0 .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.c | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_main.c | 0 .../validation/api}/std_clib/.gitignore | 0 .../validation/api}/std_clib/Makefile.am | 0 .../validation/api}/std_clib/std_clib.c | 0 .../validation/api}/std_clib/std_clib.h | 0 .../validation/api}/std_clib/std_clib_main.c | 0 .../validation/api}/system/.gitignore | 0 .../validation/api}/system/Makefile.am | 0 .../validation/api}/system/system.c | 0 .../validation/api}/system/system.h | 0 .../validation/api}/system/system_main.c | 0 .../validation/api}/thread/.gitignore | 0 .../validation/api}/thread/Makefile.am | 0 .../validation/api}/thread/thread.c | 0 .../validation/api}/thread/thread.h | 0 .../validation/api}/thread/thread_main.c | 0 .../validation/api}/time/.gitignore | 0 .../validation/api}/time/Makefile.am | 0 .../validation/api}/time/time.c | 0 .../validation/api}/time/time.h | 0 .../validation/api}/time/time_main.c | 0 .../validation/api}/timer/.gitignore | 0 .../validation/api}/timer/Makefile.am | 0 .../validation/api}/timer/timer.c | 0 .../validation/api}/timer/timer.h | 0 .../validation/api}/timer/timer_main.c | 0 .../validation/api}/traffic_mngr/.gitignore | 0 .../validation/api}/traffic_mngr/Makefile.am | 0 .../validation/api}/traffic_mngr/traffic_mngr.c | 0 .../validation/api}/traffic_mngr/traffic_mngr.h | 0 .../api}/traffic_mngr/traffic_mngr_main.c | 0 test/m4/configure.m4 | 33 +------------- test/platform/linux-generic/Makefile.am | 52 +++++++++++----------- test/platform/linux-generic/Makefile.inc | 4 +- test/platform/linux-generic/pktio/pktio_run.sh | 4 +- .../platform/linux-generic/pktio/pktio_run_dpdk.sh | 4 +- .../linux-generic/pktio/pktio_run_netmap.sh | 4 +- .../platform/linux-generic/pktio/pktio_run_pcap.sh | 4 +- test/platform/linux-generic/pktio/pktio_run_tap.sh | 4 +- 161 files changed, 92 insertions(+), 76 deletions(-) create mode 100644 test/common_plat/Makefile.am rename test/{validation => common_plat}/common/Makefile.am (100%) rename test/{validation => common_plat}/common/mask_common.c (100%) rename test/{validation => common_plat}/common/mask_common.h (100%) rename test/{validation => common_plat}/common/odp_cunit_common.c (100%) rename test/{validation => common_plat}/common/odp_cunit_common.h (100%) create mode 100644 test/common_plat/m4/configure.m4 rename test/{ => common_plat}/m4/miscellaneous.m4 (100%) rename test/{ => common_plat}/m4/performance.m4 (100%) rename test/{ => common_plat}/m4/validation.m4 (100%) rename test/{ => common_plat}/miscellaneous/.gitignore (100%) rename test/{ => common_plat}/miscellaneous/Makefile.am (100%) rename test/{ => common_plat}/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{ => common_plat}/performance/.gitignore (100%) rename test/{ => common_plat}/performance/Makefile.am (100%) rename test/{ => common_plat}/performance/odp_crypto.c (100%) rename test/{ => common_plat}/performance/odp_l2fwd.c (100%) rename test/{ => common_plat}/performance/odp_l2fwd_run.sh (93%) rename test/{ => common_plat}/performance/odp_pktio_perf.c (100%) rename test/{ => common_plat}/performance/odp_scheduling.c (100%) rename test/{ => common_plat}/performance/odp_scheduling_run.sh (100%) create mode 100644 test/common_plat/validation/Makefile.am rename test/{validation => common_plat/validation/api}/.gitignore (100%) rename test/{validation => common_plat/validation/api}/Makefile.am (93%) rename test/{validation => common_plat/validation/api}/Makefile.inc (83%) rename test/{validation => common_plat/validation/api}/README (100%) rename test/{validation => common_plat/validation/api}/atomic/.gitignore (100%) rename test/{validation => common_plat/validation/api}/atomic/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.c (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.h (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic_main.c (100%) rename test/{validation => common_plat/validation/api}/barrier/.gitignore (100%) rename test/{validation => common_plat/validation/api}/barrier/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.c (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.h (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier_main.c (100%) rename test/{validation => common_plat/validation/api}/buffer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/buffer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.c (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.h (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/.gitignore (100%) rename test/{validation => common_plat/validation/api}/classification/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/classification/classification.c (100%) rename test/{validation => common_plat/validation/api}/classification/classification.h (100%) rename test/{validation => common_plat/validation/api}/classification/classification_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_basic.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_common.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_test_pmr.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_tests.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_testsuites.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/.gitignore (100%) rename test/{validation => common_plat/validation/api}/cpumask/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.c (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/.gitignore (100%) rename test/{validation => common_plat/validation/api}/crypto/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.c (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.h (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors_len.h (100%) rename test/{validation => common_plat/validation/api}/errno/.gitignore (100%) rename test/{validation => common_plat/validation/api}/errno/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/errno/errno.c (100%) rename test/{validation => common_plat/validation/api}/errno/errno.h (100%) rename test/{validation => common_plat/validation/api}/errno/errno_main.c (100%) rename test/{validation => common_plat/validation/api}/hash/.gitignore (100%) rename test/{validation => common_plat/validation/api}/hash/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/hash/hash.c (100%) rename test/{validation => common_plat/validation/api}/hash/hash.h (100%) rename test/{validation => common_plat/validation/api}/hash/hash_main.c (100%) rename test/{validation => common_plat/validation/api}/init/.gitignore (100%) rename test/{validation => common_plat/validation/api}/init/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/init/init.c (100%) rename test/{validation => common_plat/validation/api}/init/init.h (100%) rename test/{validation => common_plat/validation/api}/init/init_main_abort.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_log.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_ok.c (100%) rename test/{validation => common_plat/validation/api}/lock/.gitignore (100%) rename test/{validation => common_plat/validation/api}/lock/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/lock/lock.c (100%) rename test/{validation => common_plat/validation/api}/lock/lock.h (100%) rename test/{validation => common_plat/validation/api}/lock/lock_main.c (100%) rename test/{validation => common_plat/validation/api}/packet/.gitignore (100%) rename test/{validation => common_plat/validation/api}/packet/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/packet/packet.c (100%) rename test/{validation => common_plat/validation/api}/packet/packet.h (100%) rename test/{validation => common_plat/validation/api}/packet/packet_main.c (100%) rename test/{validation => common_plat/validation/api}/pktio/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pktio/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.c (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.h (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio_main.c (100%) rename test/{validation => common_plat/validation/api}/pool/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pool/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pool/pool.c (100%) rename test/{validation => common_plat/validation/api}/pool/pool.h (100%) rename test/{validation => common_plat/validation/api}/pool/pool_main.c (100%) rename test/{validation => common_plat/validation/api}/queue/.gitignore (100%) rename test/{validation => common_plat/validation/api}/queue/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/queue/queue.c (100%) rename test/{validation => common_plat/validation/api}/queue/queue.h (100%) rename test/{validation => common_plat/validation/api}/queue/queue_main.c (100%) rename test/{validation => common_plat/validation/api}/random/.gitignore (100%) rename test/{validation => common_plat/validation/api}/random/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/random/random.c (100%) rename test/{validation => common_plat/validation/api}/random/random.h (100%) rename test/{validation => common_plat/validation/api}/random/random_main.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/.gitignore (100%) rename test/{validation => common_plat/validation/api}/scheduler/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.h (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler_main.c (100%) rename test/{validation => common_plat/validation/api}/shmem/.gitignore (100%) rename test/{validation => common_plat/validation/api}/shmem/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.c (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.h (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem_main.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/.gitignore (100%) rename test/{validation => common_plat/validation/api}/std_clib/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.h (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib_main.c (100%) rename test/{validation => common_plat/validation/api}/system/.gitignore (100%) rename test/{validation => common_plat/validation/api}/system/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/system/system.c (100%) rename test/{validation => common_plat/validation/api}/system/system.h (100%) rename test/{validation => common_plat/validation/api}/system/system_main.c (100%) rename test/{validation => common_plat/validation/api}/thread/.gitignore (100%) rename test/{validation => common_plat/validation/api}/thread/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/thread/thread.c (100%) rename test/{validation => common_plat/validation/api}/thread/thread.h (100%) rename test/{validation => common_plat/validation/api}/thread/thread_main.c (100%) rename test/{validation => common_plat/validation/api}/time/.gitignore (100%) rename test/{validation => common_plat/validation/api}/time/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/time/time.c (100%) rename test/{validation => common_plat/validation/api}/time/time.h (100%) rename test/{validation => common_plat/validation/api}/time/time_main.c (100%) rename test/{validation => common_plat/validation/api}/timer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/timer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/timer/timer.c (100%) rename test/{validation => common_plat/validation/api}/timer/timer.h (100%) rename test/{validation => common_plat/validation/api}/timer/timer_main.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/.gitignore (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.h (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr_main.c (100%) -- 2.7.4 diff --git a/test/Makefile.am b/test/Makefile.am index 8bab8fd..59532c8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = performance miscellaneous +SUBDIRS = common_plat if cunit_support - SUBDIRS += validation @platform_with_platform@ + SUBDIRS += @platform_with_platform@ endif diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am new file mode 100644 index 0000000..af78bb6 --- /dev/null +++ b/test/common_plat/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = + +if cunit_support +SUBDIRS += common +endif + +SUBDIRS += performance miscellaneous validation diff --git a/test/validation/common/Makefile.am b/test/common_plat/common/Makefile.am similarity index 100% rename from test/validation/common/Makefile.am rename to test/common_plat/common/Makefile.am diff --git a/test/validation/common/mask_common.c b/test/common_plat/common/mask_common.c similarity index 100% rename from test/validation/common/mask_common.c rename to test/common_plat/common/mask_common.c diff --git a/test/validation/common/mask_common.h b/test/common_plat/common/mask_common.h similarity index 100% rename from test/validation/common/mask_common.h rename to test/common_plat/common/mask_common.h diff --git a/test/validation/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c similarity index 100% rename from test/validation/common/odp_cunit_common.c rename to test/common_plat/common/odp_cunit_common.c diff --git a/test/validation/common/odp_cunit_common.h b/test/common_plat/common/odp_cunit_common.h similarity index 100% rename from test/validation/common/odp_cunit_common.h rename to test/common_plat/common/odp_cunit_common.h diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 new file mode 100644 index 0000000..be878bd --- /dev/null +++ b/test/common_plat/m4/configure.m4 @@ -0,0 +1,33 @@ +m4_include([test/common_plat/m4/miscellaneous.m4]) +m4_include([test/common_plat/m4/performance.m4]) +m4_include([test/common_plat/m4/validation.m4]) + +AC_CONFIG_FILES([test/common_plat/Makefile + test/common_plat/common/Makefile + test/common_plat/miscellaneous/Makefile + test/common_plat/performance/Makefile + test/common_plat/validation/Makefile + test/common_plat/validation/api/atomic/Makefile + test/common_plat/validation/api/barrier/Makefile + test/common_plat/validation/api/buffer/Makefile + test/common_plat/validation/api/classification/Makefile + test/common_plat/validation/api/cpumask/Makefile + test/common_plat/validation/api/crypto/Makefile + test/common_plat/validation/api/errno/Makefile + test/common_plat/validation/api/hash/Makefile + test/common_plat/validation/api/init/Makefile + test/common_plat/validation/api/lock/Makefile + test/common_plat/validation/api/Makefile + test/common_plat/validation/api/packet/Makefile + test/common_plat/validation/api/pktio/Makefile + test/common_plat/validation/api/pool/Makefile + test/common_plat/validation/api/queue/Makefile + test/common_plat/validation/api/random/Makefile + test/common_plat/validation/api/scheduler/Makefile + test/common_plat/validation/api/shmem/Makefile + test/common_plat/validation/api/std_clib/Makefile + test/common_plat/validation/api/system/Makefile + test/common_plat/validation/api/thread/Makefile + test/common_plat/validation/api/time/Makefile + test/common_plat/validation/api/timer/Makefile + test/common_plat/validation/api/traffic_mngr/Makefile]) diff --git a/test/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4 similarity index 100% rename from test/m4/miscellaneous.m4 rename to test/common_plat/m4/miscellaneous.m4 diff --git a/test/m4/performance.m4 b/test/common_plat/m4/performance.m4 similarity index 100% rename from test/m4/performance.m4 rename to test/common_plat/m4/performance.m4 diff --git a/test/m4/validation.m4 b/test/common_plat/m4/validation.m4 similarity index 100% rename from test/m4/validation.m4 rename to test/common_plat/m4/validation.m4 diff --git a/test/miscellaneous/.gitignore b/test/common_plat/miscellaneous/.gitignore similarity index 100% rename from test/miscellaneous/.gitignore rename to test/common_plat/miscellaneous/.gitignore diff --git a/test/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am similarity index 100% rename from test/miscellaneous/Makefile.am rename to test/common_plat/miscellaneous/Makefile.am diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp similarity index 100% rename from test/miscellaneous/odp_api_from_cpp.cpp rename to test/common_plat/miscellaneous/odp_api_from_cpp.cpp diff --git a/test/performance/.gitignore b/test/common_plat/performance/.gitignore similarity index 100% rename from test/performance/.gitignore rename to test/common_plat/performance/.gitignore diff --git a/test/performance/Makefile.am b/test/common_plat/performance/Makefile.am similarity index 100% rename from test/performance/Makefile.am rename to test/common_plat/performance/Makefile.am diff --git a/test/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c similarity index 100% rename from test/performance/odp_crypto.c rename to test/common_plat/performance/odp_crypto.c diff --git a/test/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c similarity index 100% rename from test/performance/odp_l2fwd.c rename to test/common_plat/performance/odp_l2fwd.c diff --git a/test/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh similarity index 93% rename from test/performance/odp_l2fwd_run.sh rename to test/common_plat/performance/odp_l2fwd_run.sh index 1fff087..68e4498 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -25,7 +25,7 @@ TEST_DIR="${TEST_DIR:-$PWD}" # directory where test sources are, including scripts TEST_SRC_DIR=$(dirname $0) -PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH +PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 @@ -37,8 +37,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env +elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." diff --git a/test/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c similarity index 100% rename from test/performance/odp_pktio_perf.c rename to test/common_plat/performance/odp_pktio_perf.c diff --git a/test/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c similarity index 100% rename from test/performance/odp_scheduling.c rename to test/common_plat/performance/odp_scheduling.c diff --git a/test/performance/odp_scheduling_run.sh b/test/common_plat/performance/odp_scheduling_run.sh similarity index 100% rename from test/performance/odp_scheduling_run.sh rename to test/common_plat/performance/odp_scheduling_run.sh diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am new file mode 100644 index 0000000..5d525fb --- /dev/null +++ b/test/common_plat/validation/Makefile.am @@ -0,0 +1,3 @@ +if cunit_support + SUBDIRS = api +endif diff --git a/test/validation/.gitignore b/test/common_plat/validation/api/.gitignore similarity index 100% rename from test/validation/.gitignore rename to test/common_plat/validation/api/.gitignore diff --git a/test/validation/Makefile.am b/test/common_plat/validation/api/Makefile.am similarity index 93% rename from test/validation/Makefile.am rename to test/common_plat/validation/api/Makefile.am index 90cc549..e2d30a6 100644 --- a/test/validation/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -22,7 +22,7 @@ ODP_MODULES = atomic \ shmem \ system -SUBDIRS = common $(ODP_MODULES) +SUBDIRS = $(ODP_MODULES) #The tests will need to retain the deprecated test implementation AM_CFLAGS += -Wno-deprecated-declarations diff --git a/test/validation/Makefile.inc b/test/common_plat/validation/api/Makefile.inc similarity index 83% rename from test/validation/Makefile.inc rename to test/common_plat/validation/api/Makefile.inc index 9f36f9d..ffba620 100644 --- a/test/validation/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,13 +1,13 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/validation/common +COMMON_DIR = $(top_builddir)/test/common_plat/common #the following option ensure that option '-I.' is not passed to gcc, #therefore distinguishing between '#include "X"' and '#include '. #It allows common filenames (such as 'errno.h') to be used locally. AUTOMAKE_OPTIONS = nostdinc -AM_CFLAGS += -I$(top_srcdir)/test/validation/common +AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la diff --git a/test/validation/README b/test/common_plat/validation/api/README similarity index 100% rename from test/validation/README rename to test/common_plat/validation/api/README diff --git a/test/validation/atomic/.gitignore b/test/common_plat/validation/api/atomic/.gitignore similarity index 100% rename from test/validation/atomic/.gitignore rename to test/common_plat/validation/api/atomic/.gitignore diff --git a/test/validation/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am similarity index 100% rename from test/validation/atomic/Makefile.am rename to test/common_plat/validation/api/atomic/Makefile.am diff --git a/test/validation/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c similarity index 100% rename from test/validation/atomic/atomic.c rename to test/common_plat/validation/api/atomic/atomic.c diff --git a/test/validation/atomic/atomic.h b/test/common_plat/validation/api/atomic/atomic.h similarity index 100% rename from test/validation/atomic/atomic.h rename to test/common_plat/validation/api/atomic/atomic.h diff --git a/test/validation/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c similarity index 100% rename from test/validation/atomic/atomic_main.c rename to test/common_plat/validation/api/atomic/atomic_main.c diff --git a/test/validation/barrier/.gitignore b/test/common_plat/validation/api/barrier/.gitignore similarity index 100% rename from test/validation/barrier/.gitignore rename to test/common_plat/validation/api/barrier/.gitignore diff --git a/test/validation/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am similarity index 100% rename from test/validation/barrier/Makefile.am rename to test/common_plat/validation/api/barrier/Makefile.am diff --git a/test/validation/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c similarity index 100% rename from test/validation/barrier/barrier.c rename to test/common_plat/validation/api/barrier/barrier.c diff --git a/test/validation/barrier/barrier.h b/test/common_plat/validation/api/barrier/barrier.h similarity index 100% rename from test/validation/barrier/barrier.h rename to test/common_plat/validation/api/barrier/barrier.h diff --git a/test/validation/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c similarity index 100% rename from test/validation/barrier/barrier_main.c rename to test/common_plat/validation/api/barrier/barrier_main.c diff --git a/test/validation/buffer/.gitignore b/test/common_plat/validation/api/buffer/.gitignore similarity index 100% rename from test/validation/buffer/.gitignore rename to test/common_plat/validation/api/buffer/.gitignore diff --git a/test/validation/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am similarity index 100% rename from test/validation/buffer/Makefile.am rename to test/common_plat/validation/api/buffer/Makefile.am diff --git a/test/validation/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c similarity index 100% rename from test/validation/buffer/buffer.c rename to test/common_plat/validation/api/buffer/buffer.c diff --git a/test/validation/buffer/buffer.h b/test/common_plat/validation/api/buffer/buffer.h similarity index 100% rename from test/validation/buffer/buffer.h rename to test/common_plat/validation/api/buffer/buffer.h diff --git a/test/validation/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c similarity index 100% rename from test/validation/buffer/buffer_main.c rename to test/common_plat/validation/api/buffer/buffer_main.c diff --git a/test/validation/classification/.gitignore b/test/common_plat/validation/api/classification/.gitignore similarity index 100% rename from test/validation/classification/.gitignore rename to test/common_plat/validation/api/classification/.gitignore diff --git a/test/validation/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am similarity index 100% rename from test/validation/classification/Makefile.am rename to test/common_plat/validation/api/classification/Makefile.am diff --git a/test/validation/classification/classification.c b/test/common_plat/validation/api/classification/classification.c similarity index 100% rename from test/validation/classification/classification.c rename to test/common_plat/validation/api/classification/classification.c diff --git a/test/validation/classification/classification.h b/test/common_plat/validation/api/classification/classification.h similarity index 100% rename from test/validation/classification/classification.h rename to test/common_plat/validation/api/classification/classification.h diff --git a/test/validation/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c similarity index 100% rename from test/validation/classification/classification_main.c rename to test/common_plat/validation/api/classification/classification_main.c diff --git a/test/validation/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c similarity index 100% rename from test/validation/classification/odp_classification_basic.c rename to test/common_plat/validation/api/classification/odp_classification_basic.c diff --git a/test/validation/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c similarity index 100% rename from test/validation/classification/odp_classification_common.c rename to test/common_plat/validation/api/classification/odp_classification_common.c diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c similarity index 100% rename from test/validation/classification/odp_classification_test_pmr.c rename to test/common_plat/validation/api/classification/odp_classification_test_pmr.c diff --git a/test/validation/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c similarity index 100% rename from test/validation/classification/odp_classification_tests.c rename to test/common_plat/validation/api/classification/odp_classification_tests.c diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h similarity index 100% rename from test/validation/classification/odp_classification_testsuites.h rename to test/common_plat/validation/api/classification/odp_classification_testsuites.h diff --git a/test/validation/cpumask/.gitignore b/test/common_plat/validation/api/cpumask/.gitignore similarity index 100% rename from test/validation/cpumask/.gitignore rename to test/common_plat/validation/api/cpumask/.gitignore diff --git a/test/validation/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am similarity index 100% rename from test/validation/cpumask/Makefile.am rename to test/common_plat/validation/api/cpumask/Makefile.am diff --git a/test/validation/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c similarity index 100% rename from test/validation/cpumask/cpumask.c rename to test/common_plat/validation/api/cpumask/cpumask.c diff --git a/test/validation/cpumask/cpumask.h b/test/common_plat/validation/api/cpumask/cpumask.h similarity index 100% rename from test/validation/cpumask/cpumask.h rename to test/common_plat/validation/api/cpumask/cpumask.h diff --git a/test/validation/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c similarity index 100% rename from test/validation/cpumask/cpumask_main.c rename to test/common_plat/validation/api/cpumask/cpumask_main.c diff --git a/test/validation/crypto/.gitignore b/test/common_plat/validation/api/crypto/.gitignore similarity index 100% rename from test/validation/crypto/.gitignore rename to test/common_plat/validation/api/crypto/.gitignore diff --git a/test/validation/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am similarity index 100% rename from test/validation/crypto/Makefile.am rename to test/common_plat/validation/api/crypto/Makefile.am diff --git a/test/validation/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c similarity index 100% rename from test/validation/crypto/crypto.c rename to test/common_plat/validation/api/crypto/crypto.c diff --git a/test/validation/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h similarity index 100% rename from test/validation/crypto/crypto.h rename to test/common_plat/validation/api/crypto/crypto.h diff --git a/test/validation/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c similarity index 100% rename from test/validation/crypto/crypto_main.c rename to test/common_plat/validation/api/crypto/crypto_main.c diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.c rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.c diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.h rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.h diff --git a/test/validation/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h similarity index 100% rename from test/validation/crypto/test_vectors.h rename to test/common_plat/validation/api/crypto/test_vectors.h diff --git a/test/validation/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h similarity index 100% rename from test/validation/crypto/test_vectors_len.h rename to test/common_plat/validation/api/crypto/test_vectors_len.h diff --git a/test/validation/errno/.gitignore b/test/common_plat/validation/api/errno/.gitignore similarity index 100% rename from test/validation/errno/.gitignore rename to test/common_plat/validation/api/errno/.gitignore diff --git a/test/validation/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am similarity index 100% rename from test/validation/errno/Makefile.am rename to test/common_plat/validation/api/errno/Makefile.am diff --git a/test/validation/errno/errno.c b/test/common_plat/validation/api/errno/errno.c similarity index 100% rename from test/validation/errno/errno.c rename to test/common_plat/validation/api/errno/errno.c diff --git a/test/validation/errno/errno.h b/test/common_plat/validation/api/errno/errno.h similarity index 100% rename from test/validation/errno/errno.h rename to test/common_plat/validation/api/errno/errno.h diff --git a/test/validation/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c similarity index 100% rename from test/validation/errno/errno_main.c rename to test/common_plat/validation/api/errno/errno_main.c diff --git a/test/validation/hash/.gitignore b/test/common_plat/validation/api/hash/.gitignore similarity index 100% rename from test/validation/hash/.gitignore rename to test/common_plat/validation/api/hash/.gitignore diff --git a/test/validation/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am similarity index 100% rename from test/validation/hash/Makefile.am rename to test/common_plat/validation/api/hash/Makefile.am diff --git a/test/validation/hash/hash.c b/test/common_plat/validation/api/hash/hash.c similarity index 100% rename from test/validation/hash/hash.c rename to test/common_plat/validation/api/hash/hash.c diff --git a/test/validation/hash/hash.h b/test/common_plat/validation/api/hash/hash.h similarity index 100% rename from test/validation/hash/hash.h rename to test/common_plat/validation/api/hash/hash.h diff --git a/test/validation/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c similarity index 100% rename from test/validation/hash/hash_main.c rename to test/common_plat/validation/api/hash/hash_main.c diff --git a/test/validation/init/.gitignore b/test/common_plat/validation/api/init/.gitignore similarity index 100% rename from test/validation/init/.gitignore rename to test/common_plat/validation/api/init/.gitignore diff --git a/test/validation/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am similarity index 100% rename from test/validation/init/Makefile.am rename to test/common_plat/validation/api/init/Makefile.am diff --git a/test/validation/init/init.c b/test/common_plat/validation/api/init/init.c similarity index 100% rename from test/validation/init/init.c rename to test/common_plat/validation/api/init/init.c diff --git a/test/validation/init/init.h b/test/common_plat/validation/api/init/init.h similarity index 100% rename from test/validation/init/init.h rename to test/common_plat/validation/api/init/init.h diff --git a/test/validation/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c similarity index 100% rename from test/validation/init/init_main_abort.c rename to test/common_plat/validation/api/init/init_main_abort.c diff --git a/test/validation/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c similarity index 100% rename from test/validation/init/init_main_log.c rename to test/common_plat/validation/api/init/init_main_log.c diff --git a/test/validation/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c similarity index 100% rename from test/validation/init/init_main_ok.c rename to test/common_plat/validation/api/init/init_main_ok.c diff --git a/test/validation/lock/.gitignore b/test/common_plat/validation/api/lock/.gitignore similarity index 100% rename from test/validation/lock/.gitignore rename to test/common_plat/validation/api/lock/.gitignore diff --git a/test/validation/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am similarity index 100% rename from test/validation/lock/Makefile.am rename to test/common_plat/validation/api/lock/Makefile.am diff --git a/test/validation/lock/lock.c b/test/common_plat/validation/api/lock/lock.c similarity index 100% rename from test/validation/lock/lock.c rename to test/common_plat/validation/api/lock/lock.c diff --git a/test/validation/lock/lock.h b/test/common_plat/validation/api/lock/lock.h similarity index 100% rename from test/validation/lock/lock.h rename to test/common_plat/validation/api/lock/lock.h diff --git a/test/validation/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c similarity index 100% rename from test/validation/lock/lock_main.c rename to test/common_plat/validation/api/lock/lock_main.c diff --git a/test/validation/packet/.gitignore b/test/common_plat/validation/api/packet/.gitignore similarity index 100% rename from test/validation/packet/.gitignore rename to test/common_plat/validation/api/packet/.gitignore diff --git a/test/validation/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am similarity index 100% rename from test/validation/packet/Makefile.am rename to test/common_plat/validation/api/packet/Makefile.am diff --git a/test/validation/packet/packet.c b/test/common_plat/validation/api/packet/packet.c similarity index 100% rename from test/validation/packet/packet.c rename to test/common_plat/validation/api/packet/packet.c diff --git a/test/validation/packet/packet.h b/test/common_plat/validation/api/packet/packet.h similarity index 100% rename from test/validation/packet/packet.h rename to test/common_plat/validation/api/packet/packet.h diff --git a/test/validation/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c similarity index 100% rename from test/validation/packet/packet_main.c rename to test/common_plat/validation/api/packet/packet_main.c diff --git a/test/validation/pktio/.gitignore b/test/common_plat/validation/api/pktio/.gitignore similarity index 100% rename from test/validation/pktio/.gitignore rename to test/common_plat/validation/api/pktio/.gitignore diff --git a/test/validation/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am similarity index 100% rename from test/validation/pktio/Makefile.am rename to test/common_plat/validation/api/pktio/Makefile.am diff --git a/test/validation/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c similarity index 100% rename from test/validation/pktio/pktio.c rename to test/common_plat/validation/api/pktio/pktio.c diff --git a/test/validation/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h similarity index 100% rename from test/validation/pktio/pktio.h rename to test/common_plat/validation/api/pktio/pktio.h diff --git a/test/validation/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c similarity index 100% rename from test/validation/pktio/pktio_main.c rename to test/common_plat/validation/api/pktio/pktio_main.c diff --git a/test/validation/pool/.gitignore b/test/common_plat/validation/api/pool/.gitignore similarity index 100% rename from test/validation/pool/.gitignore rename to test/common_plat/validation/api/pool/.gitignore diff --git a/test/validation/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am similarity index 100% rename from test/validation/pool/Makefile.am rename to test/common_plat/validation/api/pool/Makefile.am diff --git a/test/validation/pool/pool.c b/test/common_plat/validation/api/pool/pool.c similarity index 100% rename from test/validation/pool/pool.c rename to test/common_plat/validation/api/pool/pool.c diff --git a/test/validation/pool/pool.h b/test/common_plat/validation/api/pool/pool.h similarity index 100% rename from test/validation/pool/pool.h rename to test/common_plat/validation/api/pool/pool.h diff --git a/test/validation/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c similarity index 100% rename from test/validation/pool/pool_main.c rename to test/common_plat/validation/api/pool/pool_main.c diff --git a/test/validation/queue/.gitignore b/test/common_plat/validation/api/queue/.gitignore similarity index 100% rename from test/validation/queue/.gitignore rename to test/common_plat/validation/api/queue/.gitignore diff --git a/test/validation/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am similarity index 100% rename from test/validation/queue/Makefile.am rename to test/common_plat/validation/api/queue/Makefile.am diff --git a/test/validation/queue/queue.c b/test/common_plat/validation/api/queue/queue.c similarity index 100% rename from test/validation/queue/queue.c rename to test/common_plat/validation/api/queue/queue.c diff --git a/test/validation/queue/queue.h b/test/common_plat/validation/api/queue/queue.h similarity index 100% rename from test/validation/queue/queue.h rename to test/common_plat/validation/api/queue/queue.h diff --git a/test/validation/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c similarity index 100% rename from test/validation/queue/queue_main.c rename to test/common_plat/validation/api/queue/queue_main.c diff --git a/test/validation/random/.gitignore b/test/common_plat/validation/api/random/.gitignore similarity index 100% rename from test/validation/random/.gitignore rename to test/common_plat/validation/api/random/.gitignore diff --git a/test/validation/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am similarity index 100% rename from test/validation/random/Makefile.am rename to test/common_plat/validation/api/random/Makefile.am diff --git a/test/validation/random/random.c b/test/common_plat/validation/api/random/random.c similarity index 100% rename from test/validation/random/random.c rename to test/common_plat/validation/api/random/random.c diff --git a/test/validation/random/random.h b/test/common_plat/validation/api/random/random.h similarity index 100% rename from test/validation/random/random.h rename to test/common_plat/validation/api/random/random.h diff --git a/test/validation/random/random_main.c b/test/common_plat/validation/api/random/random_main.c similarity index 100% rename from test/validation/random/random_main.c rename to test/common_plat/validation/api/random/random_main.c diff --git a/test/validation/scheduler/.gitignore b/test/common_plat/validation/api/scheduler/.gitignore similarity index 100% rename from test/validation/scheduler/.gitignore rename to test/common_plat/validation/api/scheduler/.gitignore diff --git a/test/validation/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am similarity index 100% rename from test/validation/scheduler/Makefile.am rename to test/common_plat/validation/api/scheduler/Makefile.am diff --git a/test/validation/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c similarity index 100% rename from test/validation/scheduler/scheduler.c rename to test/common_plat/validation/api/scheduler/scheduler.c diff --git a/test/validation/scheduler/scheduler.h b/test/common_plat/validation/api/scheduler/scheduler.h similarity index 100% rename from test/validation/scheduler/scheduler.h rename to test/common_plat/validation/api/scheduler/scheduler.h diff --git a/test/validation/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c similarity index 100% rename from test/validation/scheduler/scheduler_main.c rename to test/common_plat/validation/api/scheduler/scheduler_main.c diff --git a/test/validation/shmem/.gitignore b/test/common_plat/validation/api/shmem/.gitignore similarity index 100% rename from test/validation/shmem/.gitignore rename to test/common_plat/validation/api/shmem/.gitignore diff --git a/test/validation/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am similarity index 100% rename from test/validation/shmem/Makefile.am rename to test/common_plat/validation/api/shmem/Makefile.am diff --git a/test/validation/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c similarity index 100% rename from test/validation/shmem/shmem.c rename to test/common_plat/validation/api/shmem/shmem.c diff --git a/test/validation/shmem/shmem.h b/test/common_plat/validation/api/shmem/shmem.h similarity index 100% rename from test/validation/shmem/shmem.h rename to test/common_plat/validation/api/shmem/shmem.h diff --git a/test/validation/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c similarity index 100% rename from test/validation/shmem/shmem_main.c rename to test/common_plat/validation/api/shmem/shmem_main.c diff --git a/test/validation/std_clib/.gitignore b/test/common_plat/validation/api/std_clib/.gitignore similarity index 100% rename from test/validation/std_clib/.gitignore rename to test/common_plat/validation/api/std_clib/.gitignore diff --git a/test/validation/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am similarity index 100% rename from test/validation/std_clib/Makefile.am rename to test/common_plat/validation/api/std_clib/Makefile.am diff --git a/test/validation/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c similarity index 100% rename from test/validation/std_clib/std_clib.c rename to test/common_plat/validation/api/std_clib/std_clib.c diff --git a/test/validation/std_clib/std_clib.h b/test/common_plat/validation/api/std_clib/std_clib.h similarity index 100% rename from test/validation/std_clib/std_clib.h rename to test/common_plat/validation/api/std_clib/std_clib.h diff --git a/test/validation/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c similarity index 100% rename from test/validation/std_clib/std_clib_main.c rename to test/common_plat/validation/api/std_clib/std_clib_main.c diff --git a/test/validation/system/.gitignore b/test/common_plat/validation/api/system/.gitignore similarity index 100% rename from test/validation/system/.gitignore rename to test/common_plat/validation/api/system/.gitignore diff --git a/test/validation/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am similarity index 100% rename from test/validation/system/Makefile.am rename to test/common_plat/validation/api/system/Makefile.am diff --git a/test/validation/system/system.c b/test/common_plat/validation/api/system/system.c similarity index 100% rename from test/validation/system/system.c rename to test/common_plat/validation/api/system/system.c diff --git a/test/validation/system/system.h b/test/common_plat/validation/api/system/system.h similarity index 100% rename from test/validation/system/system.h rename to test/common_plat/validation/api/system/system.h diff --git a/test/validation/system/system_main.c b/test/common_plat/validation/api/system/system_main.c similarity index 100% rename from test/validation/system/system_main.c rename to test/common_plat/validation/api/system/system_main.c diff --git a/test/validation/thread/.gitignore b/test/common_plat/validation/api/thread/.gitignore similarity index 100% rename from test/validation/thread/.gitignore rename to test/common_plat/validation/api/thread/.gitignore diff --git a/test/validation/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am similarity index 100% rename from test/validation/thread/Makefile.am rename to test/common_plat/validation/api/thread/Makefile.am diff --git a/test/validation/thread/thread.c b/test/common_plat/validation/api/thread/thread.c similarity index 100% rename from test/validation/thread/thread.c rename to test/common_plat/validation/api/thread/thread.c diff --git a/test/validation/thread/thread.h b/test/common_plat/validation/api/thread/thread.h similarity index 100% rename from test/validation/thread/thread.h rename to test/common_plat/validation/api/thread/thread.h diff --git a/test/validation/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c similarity index 100% rename from test/validation/thread/thread_main.c rename to test/common_plat/validation/api/thread/thread_main.c diff --git a/test/validation/time/.gitignore b/test/common_plat/validation/api/time/.gitignore similarity index 100% rename from test/validation/time/.gitignore rename to test/common_plat/validation/api/time/.gitignore diff --git a/test/validation/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am similarity index 100% rename from test/validation/time/Makefile.am rename to test/common_plat/validation/api/time/Makefile.am diff --git a/test/validation/time/time.c b/test/common_plat/validation/api/time/time.c similarity index 100% rename from test/validation/time/time.c rename to test/common_plat/validation/api/time/time.c diff --git a/test/validation/time/time.h b/test/common_plat/validation/api/time/time.h similarity index 100% rename from test/validation/time/time.h rename to test/common_plat/validation/api/time/time.h diff --git a/test/validation/time/time_main.c b/test/common_plat/validation/api/time/time_main.c similarity index 100% rename from test/validation/time/time_main.c rename to test/common_plat/validation/api/time/time_main.c diff --git a/test/validation/timer/.gitignore b/test/common_plat/validation/api/timer/.gitignore similarity index 100% rename from test/validation/timer/.gitignore rename to test/common_plat/validation/api/timer/.gitignore diff --git a/test/validation/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am similarity index 100% rename from test/validation/timer/Makefile.am rename to test/common_plat/validation/api/timer/Makefile.am diff --git a/test/validation/timer/timer.c b/test/common_plat/validation/api/timer/timer.c similarity index 100% rename from test/validation/timer/timer.c rename to test/common_plat/validation/api/timer/timer.c diff --git a/test/validation/timer/timer.h b/test/common_plat/validation/api/timer/timer.h similarity index 100% rename from test/validation/timer/timer.h rename to test/common_plat/validation/api/timer/timer.h diff --git a/test/validation/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c similarity index 100% rename from test/validation/timer/timer_main.c rename to test/common_plat/validation/api/timer/timer_main.c diff --git a/test/validation/traffic_mngr/.gitignore b/test/common_plat/validation/api/traffic_mngr/.gitignore similarity index 100% rename from test/validation/traffic_mngr/.gitignore rename to test/common_plat/validation/api/traffic_mngr/.gitignore diff --git a/test/validation/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am similarity index 100% rename from test/validation/traffic_mngr/Makefile.am rename to test/common_plat/validation/api/traffic_mngr/Makefile.am diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.c diff --git a/test/validation/traffic_mngr/traffic_mngr.h b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.h rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.h diff --git a/test/validation/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr_main.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 5a74809..460e844 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -1,32 +1,3 @@ -m4_include([test/m4/miscellaneous.m4]) -m4_include([test/m4/performance.m4]) -m4_include([test/m4/validation.m4]) +m4_include([test/common_plat/m4/configure.m4]) -AC_CONFIG_FILES([test/Makefile - test/miscellaneous/Makefile - test/performance/Makefile - test/validation/atomic/Makefile - test/validation/barrier/Makefile - test/validation/buffer/Makefile - test/validation/classification/Makefile - test/validation/common/Makefile - test/validation/cpumask/Makefile - test/validation/crypto/Makefile - test/validation/errno/Makefile - test/validation/hash/Makefile - test/validation/init/Makefile - test/validation/lock/Makefile - test/validation/Makefile - test/validation/packet/Makefile - test/validation/pktio/Makefile - test/validation/pool/Makefile - test/validation/queue/Makefile - test/validation/random/Makefile - test/validation/scheduler/Makefile - test/validation/shmem/Makefile - test/validation/std_clib/Makefile - test/validation/system/Makefile - test/validation/thread/Makefile - test/validation/time/Makefile - test/validation/timer/Makefile - test/validation/traffic_mngr/Makefile]) +AC_CONFIG_FILES([test/Makefile]) diff --git a/test/platform/linux-generic/Makefile.am b/test/platform/linux-generic/Makefile.am index 2d58c57..83da140 100644 --- a/test/platform/linux-generic/Makefile.am +++ b/test/platform/linux-generic/Makefile.am @@ -1,39 +1,41 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation ODP_MODULES = pktio \ ring \ shmem +ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api + if test_vald TESTS = pktio/pktio_run.sh \ pktio/pktio_run_tap.sh \ ring/ring_main$(EXEEXT) \ shmem/shmem_linux \ - ${top_builddir}/test/validation/atomic/atomic_main$(EXEEXT) \ - ${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/lock/lock_main$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/traffic_mngr/traffic_mngr_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) + $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/errno/errno_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/hash/hash_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/queue/queue_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/random/random_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/scheduler/scheduler_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/std_clib/std_clib_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/time/time_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) SUBDIRS = $(ODP_MODULES) diff --git a/test/platform/linux-generic/Makefile.inc b/test/platform/linux-generic/Makefile.inc index 80b66ae..b26324f 100644 --- a/test/platform/linux-generic/Makefile.inc +++ b/test/platform/linux-generic/Makefile.inc @@ -4,11 +4,11 @@ AM_LDFLAGS += -static -LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la +LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common +INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh index 1dc1f44..0905b8b 100755 --- a/test/platform/linux-generic/pktio/pktio_run.sh +++ b/test/platform/linux-generic/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}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh index fd552c6..4d16b29 100755 --- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh +++ b/test/platform/linux-generic/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}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh index b651ea3..6fd271b 100755 --- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh +++ b/test/platform/linux-generic/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}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh index 51716fb..721141a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh +++ b/test/platform/linux-generic/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}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh index 1150158..96f6d5a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_tap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_tap.sh @@ -16,9 +16,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT})