From patchwork Tue Sep 5 20:00:05 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: 111732 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3310298qge; Tue, 5 Sep 2017 13:12:51 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDZ6F7vsryuzL+PKKtUSl8jQG3PGG8ojnbSzgB+PtC3fyxkJriiOLx6Kk8xpmqYEJMYg+aZ X-Received: by 10.55.221.149 with SMTP id u21mr358432qku.278.1504642371738; Tue, 05 Sep 2017 13:12:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504642371; cv=none; d=google.com; s=arc-20160816; b=tft8VfGChFXnmYeZ9ofDQUZjy9rv4XXmcBZ5Q0ydC63PRUW47imyC4yLwbNVJP2QTw 6FlIevatO2P6WANvBSIMVhvZ3oYivQBsMmUlm/bfmnSob6LyL2DQAAMWjAD7Z/P5ZM+c 6gi0+MOvqd9kdsbH2qh7VA93nRZ23BDSoHAsPP2Izc7Z7JrFqY4oV79E2H3Xr2h6OTKh EgxjQXKkYoVPftWKrRzjQ1ZWJGmfiloIUjNY2T7UGRQJ1/Qaz6KYpPUykDd3O9EInFYt klwBLiu2Ib3xFNpjI9yXOelwSUkd1wOWjPs6CAWZCCNGrrHPhcjS48NwmzfsYrzPqkqK 2lSg== 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=tJCbHWsXlT0+iiQB2KFQl5kIFZMMBGi4c/Ik+vRFuYk=; b=aP/Owk/XILPMqdlV5szam31gTQnYKuGPV41mjudH6aww9LpNNIpi6SZWG/Qkwasqmi Hwkmafiiort80Gs7jid6BvKr1hd8GQwb7Gyc1Udl/L65Z8k8isIjBrmgglXbxRFH9hN+ KqsksUFRs4s0vUhjPNq0SxKR/rTsrmUcqZNy9VFCgZRxVyCqZs5eGgzEKs5xZqwqUAm3 RpYplBxnwix5bq+2/JmdOFUNFFC2GMIgZb5q9cr+i+XeGx4Rmo/55PdY3N5Rd5B7R9RR kHTE6ekITIoiNlR/23EvO8DpNN8sdgXv6FsV/ID4/y3V6xE8nWIiNOOBLS9lsg1zGG3J MePA== 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 n77si1307310qki.219.2017.09.05.13.12.51; Tue, 05 Sep 2017 13:12:51 -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 26F2861E02; Tue, 5 Sep 2017 20:12:51 +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 6E68A62D32; Tue, 5 Sep 2017 20: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 80D796156B; Tue, 5 Sep 2017 20:00:44 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 7C0E561C9E for ; Tue, 5 Sep 2017 20:00:24 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 8406018501E for ; Tue, 5 Sep 2017 23:00:23 +0300 (MSK) Received: from smtp2j.mail.yandex.net (smtp2j.mail.yandex.net [2a02:6b8:0:801::ac]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id jU1D0ZxKtm-0NTeriUd; Tue, 05 Sep 2017 23:00:23 +0300 Received: by smtp2j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id anlnl3rubP-0Ni8J4SE; Tue, 05 Sep 2017 23:00:23 +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 23:00:05 +0300 Message-Id: <1504641607-4966-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504641607-4966-1-git-send-email-odpbot@yandex.ru> References: <1504641607-4966-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v3 11/13] 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: 38d800e8e4b3c89a118426f28490b2e87091e127 **/ 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