From patchwork Tue Sep 5 19: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: 111719 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3247194qge; Tue, 5 Sep 2017 12:12:30 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4zoiWhIBMMcSaHoP17MScqVo/UE6qvXr8SCVDx3Zaz5n4sP5R8jN/2FZyYZo6wWtPLwZ3r X-Received: by 10.237.40.97 with SMTP id r88mr206641qtd.178.1504638750371; Tue, 05 Sep 2017 12:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638750; cv=none; d=google.com; s=arc-20160816; b=FdQHPREkz7Axit0BLkx5LL+x3c6f0+IbRwyuKnS6HiM9os+N1qgOve0gP68VyTd+3U RKZ6S3JR3dyDdmBo/sPU+HoPd4ckdXKmMV+ub2XDc7fKYm+U9P8+ONeLvWEQfR90sg7Z j3lN/mxDlZvMz7Qcz65rY3qCDp/7H+lb/2AlIvEZ1XCA+V6FPmVqKecRNzGPm/ff/kCr Mw61rRbAQ2XdruFqX661NHLoVtrddXmdbCkRJhoZMtFL0tnpz11D8FGSLp5w9DcnAqkh QE7/14a9NG19bCx6trcZCB4dQcEesnQxkfvqht9Fx7W73HsoxyuBOrMg9DltVwLZgjuP fbhw== 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=lP/qUaSo6H9Lxagpp0ZbWqIu1NXm0t/7nv5tmVb6MKA=; b=UW5SZvbHG1OTmWSs5yg2xDh9xNPr414+vcJgj8GHdjTbDH08wX3juygIEKW+71S1Xu RUPe4goO+cwxZGrfmAO89QP5dKITN1l67Wxxi7kORscMX7Bll6eMlmGp8D+KQ8XWQhrS 3HVjdIXVlteiXJCJ3mPvao81Dslf7vNTBeuG7698FeIOEJX3ddOP6MoyOZm0l4+KIBMB Dj2lxfUz0n4tbtIWXu+GjWDiXjsQhL7HqVliQb4JRCkygegUHR0WuOV7Dih21TI1GxAz iRTPepOKCd5cq2zHVAVj0PT+c1/CibikrgaMYIr+RmJhSzD1r5a855Bz1taKCw6CtIGQ MyzQ== 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 v62si1090454qka.267.2017.09.05.12.12.30; Tue, 05 Sep 2017 12:12:30 -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 116C462C60; Tue, 5 Sep 2017 19:12:30 +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 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 E6C0762CFA; Tue, 5 Sep 2017 19:01:38 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3A5DC61D9A; Tue, 5 Sep 2017 19:00:43 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 5E12C6156B for ; Tue, 5 Sep 2017 19:00:24 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 57CC656033C1 for ; Tue, 5 Sep 2017 22:00:23 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 02UA2pjumU-0NRm0ITY; Tue, 05 Sep 2017 22:00:23 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0MEW2vrm; Tue, 05 Sep 2017 22:00:22 +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: Tue, 5 Sep 2017 22:00:07 +0300 Message-Id: <1504638007-2671-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 11/11] 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: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ 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 +- 5 files changed, 7 insertions(+), 13 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..a61addd4 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,13 +24,7 @@ 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 +AM_CPPFLAGS += -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)