From patchwork Thu Sep 7 12:00:07 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: 111904 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp106578ybm; Thu, 7 Sep 2017 05:26:52 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4hlflxKvTdCtQV86Dp5mnSMMBObjobyFPDdsIsgQU1pnzU1rklwvpuaedOv+E4hP3UpbX+ X-Received: by 10.200.4.146 with SMTP id s18mr3359746qtg.240.1504787212539; Thu, 07 Sep 2017 05:26:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504787212; cv=none; d=google.com; s=arc-20160816; b=wO4gW9K8fFKHiN6cV2eqmHOPuT4wBbvFuj6aL93OJyLK7W7knNw7IY57e703oHtYqT Wg/F0/nEwXh1lleUoAkjngOzKLifORDavLAOvNduEMf9mvf/y090raCK2eNHO4J0J5UI GjjPcPT6GgRY2LutahnrPZOm7LM3uYDNDh3rUCQw0AnXfHd6BYRgr3j7Faw3PfkOIxOq E4rYIIK+uZJjQPRmM4C93NJjCbpxOfkwfvWSGqMG+rIboQ9mCmoihE2Khan3kkpV9oNl lDY3iU4JiOatxJrWUZnIEnZ3zmkx6w4DJhgEzaRZ4/bdap7H9sN8NKDD18DYEyFMWGyy JwUQ== 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=s8AkIQFDDALgnOhAH2igbVoWH1R8Er575KL3+rThg2I=; b=SHxe6hdq4LM0z8n7sQ7jrbN/YXPOjRC/tfovbyKTjMz05TUQ8iduMrzX9rKPDJ0s7m LJWL4RGv4lFEtESDmTX9QISL/7UK9+IZBE4qEOZAU4KXrclgSP5IEBe3iDpL1isHbAQU KMVPf1B5TtGYBdXIQfkbRqfJVO75GN5fIWBphKTLmKKPJ4wqpOWo9ogko9azTzzhmNo+ wXlBKxgK5m3twz67Q8cU5Bb53HXa8hveqQZK53BBRyH7dWOIlqstY5RL80jOriW7cvjh 25Tquh1oPHZjXRWODo7YEiUlxXDOqjgFWAruGy53FXxiI4iP8jEljGGtxLdW0FkSlPlP cEqA== 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 n186si2635051qkb.512.2017.09.07.05.26.52; Thu, 07 Sep 2017 05:26:52 -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 23F0D644E9; Thu, 7 Sep 2017 12:26:52 +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,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 30F3E644D6; Thu, 7 Sep 2017 12:08:39 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1E304648CD; Thu, 7 Sep 2017 12:08:30 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 68722648CD for ; Thu, 7 Sep 2017 12:00:37 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 1A6B434C5C0D for ; Thu, 7 Sep 2017 15:00:36 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ue1DU4fLD4-0aP0HPA9; Thu, 07 Sep 2017 15:00:36 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0ZdeV6Ic; Thu, 07 Sep 2017 15:00:35 +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, 7 Sep 2017 15:00:07 +0300 Message-Id: <1504785609-27545-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 12/14] 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 --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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