From patchwork Mon Sep 11 19:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 112222 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4215380qgf; Mon, 11 Sep 2017 12:11:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QASCER+iXY66SR+tpqNJ8rpM87yoX+2CaN/dKO/XGJUAuHTlUh98IrBprQGPKYP/x0yClVJ X-Received: by 10.107.17.132 with SMTP id 4mr16582835ior.165.1505157067655; Mon, 11 Sep 2017 12:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505157067; cv=none; d=google.com; s=arc-20160816; b=Si3Sm5Xa4dooi1rgS4MKWDAGZ4IZMLGYBod/NldNSEWWaTZaUOaOq9afWb3xyZ2oP0 aOFVaxbggUoAKE0f9kVdfUg8fDn7akfZl7XGXKVn2xS5k8D8cXiOjOOq00EqNQRLgnDw kwUOwxsH2qUIjuY0sAMAglR9SJLtIofWr541FOOx4shNq1u1hJBGL9bbHV29DL5XhZ+9 pRmfWGxXryWHxwXxKsO25F1mTlkrQv9dWnoHtjx6StpEJhpxUhW8TpfUjRKKXcDBrCdH xtMxFBs2dbQvcEgmPdTtFZQc9m/VhWXZOAq6rMJhayrsg3PqSf/jfrwh5b00GFOZTitB P5lQ== 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=c7vnTRIrtKyrGofD7DXcPhgusUC5mUu6E5kbNlKUVf4=; b=OrGHTav3R0uKIMLQ41jmAaubFAZjmQIs2Qg8b6yqsKfFNH2faOw9jKYFTyFTULmyyf d2tb61kMeXY9MsQxiA6zOFYHFn5hLXh9IvOQ9tSiw7uNoDrGsq/9DvhX9PI+tM4HioxH YvrTF9A0Cfuo286eKJYw2AeEeIUZ6n+BDFZ48pBQ2xlYKy3G9GRVh18/HAkBL9q3gFFY 6CTrbksOM5dfZs3nBmny21Z+ufkikdbj6O9RJk4gHUm55+eEPflxVFnJwvgQTxm7ukK4 h4rSqBtrKtsMauvYby0CIm1gyI7xVfU9D8z5MptR2FmodYc+UrujdQgshI1OAjOQka4s OCeA== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i7si5799017ioa.396.2017.09.11.12.11.01; Mon, 11 Sep 2017 12:11:01 -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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 197BD62D05; Mon, 11 Sep 2017 19:10:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 038DD61E1A; Mon, 11 Sep 2017 19:01:33 +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 D62FB61CBC; Mon, 11 Sep 2017 19:01:04 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 15B5360DC9 for ; Mon, 11 Sep 2017 19:00:31 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward100j.mail.yandex.net (Yandex) with ESMTP id D48B65D83CD5 for ; Mon, 11 Sep 2017 22:00:29 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id OwBL4lOZe7-0TnmpZkO; Mon, 11 Sep 2017 22:00:29 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Xiwxkqm3eV-0TlGQGge; Mon, 11 Sep 2017 22:00:29 +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: Mon, 11 Sep 2017 22:00:02 +0300 Message-Id: <1505156408-13887-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> References: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 173 Subject: [lng-odp] [PATCH API-NEXT v1 13/19] test: misc rewrites in Makefile.am files 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 Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 173 (muvarov:api-next) ** https://github.com/Linaro/odp/pull/173 ** Patch: https://github.com/Linaro/odp/pull/173.patch ** Base sha: 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 ** Merge commit sha: 057be0905a62a157cc96a91743ea70e66e8554ca **/ test/common_plat/miscellaneous/Makefile.am | 2 -- test/common_plat/performance/Makefile.am | 8 -------- test/common_plat/validation/Makefile.am | 2 +- test/linux-generic/mmap_vlan_ins/Makefile.am | 6 ++++-- test/linux-generic/performance/Makefile.am | 2 +- test/linux-generic/pktio_ipc/Makefile.am | 3 --- 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 5f2cc53d..7d42b07e 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -5,6 +5,4 @@ bin_PROGRAMS = odp_api_from_cpp$(EXEEXT) TESTS = odp_api_from_cpp$(EXEEXT) endif -odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS) - odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 79e8e39a..ef9537b1 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,14 +24,6 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_perf_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_l2fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test - noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am index 5d525fba..32854378 100644 --- a/test/common_plat/validation/Makefile.am +++ b/test/common_plat/validation/Makefile.am @@ -1,3 +1,3 @@ -if cunit_support +if test_vald SUBDIRS = api endif diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 2f38e5c6..e42b5254 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -1,14 +1,16 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation -dist_check_SCRIPTS = vlan.pcap \ +dist_check_SCRIPTS = \ mmap_vlan_ins.sh \ pktio_env +dist_check_DATA = vlan.pcap + test_SCRIPTS = $(dist_check_SCRIPTS) +test_DATA = $(dist_check_DATA) test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) -plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example # Clonned from example odp_l2fwd simple plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/test/linux-generic/performance/Makefile.am b/test/linux-generic/performance/Makefile.am index cb72fce9..0b5da671 100644 --- a/test/linux-generic/performance/Makefile.am +++ b/test/linux-generic/performance/Makefile.am @@ -10,4 +10,4 @@ if test_perf_proc TESTS = $(TESTSCRIPTS) endif -EXTRA_DIST = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS) diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index eaa8bdd6..4287fbc0 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -4,9 +4,6 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation test_PROGRAMS = pktio_ipc1\ pktio_ipc2 -pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h