From patchwork Wed Jan 3 22:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123353 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp10696515qgn; Wed, 3 Jan 2018 14:08:57 -0800 (PST) X-Google-Smtp-Source: ACJfBosPpu7YUpvTR2tzqGK9oTRVDGJdneI9EF3wMNAyPouiPuk1AIUOs6oVWfo8ltQKR52RhFam X-Received: by 10.55.118.199 with SMTP id r190mr3410902qkc.33.1515017336925; Wed, 03 Jan 2018 14:08:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515017336; cv=none; d=google.com; s=arc-20160816; b=mn+21H9yYRyyGB+Vyh3tYsjTgurSvky/xxXoeFdT0Bo8sXBv/I6qWtNZbExulCqm2v Q79Tz3svPVpAc3ZLLQNfopkF/QsV5PTLfA5lbbfzhN7D37JSXPgG+pynw8nDjJ1sVg8K G51q5Eq7cD+Qu5qfMggY+JVZzdxyFHcXMBOwkY16B/9/x33OP3Rooc6HpsE6fnEqTSKm jtwtEM/bGOd3i9fYuLb65DcpjAbb9J4KLdqdB/l0rzCVZNVElFIFmbcOVOCMQqu5PETL vr5eHbKajCXv+MRaCdlQObXDc3/gvNNLWVHfEmldFC3dY9xTcMwmCQtKHKbIuSdkepmm JwIA== 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=8Nftw1/AnQrXomWYfjHmZjKIVSaT/r2HAL6abQgmIQQ=; b=U2HhVaf7Bj7eKM0o1iqPZEYL334A5KvBfugB2FC/SkA3ct92EMaZcUdIFAReqiSDIC LHN9GJeX0pNPNeHXuaM91leUqe9pcSejtNgXJ5wzEBIunmJXO29DiohormNfJ4lAVB5m YU4ozRNmkRJb1V0t9DT8TcNopmlPBe9KW8O8PtGGhbsL6rjyy2oFp44z7nkfwr6fVK3r 4olAsZTHDrNu8OvxFwFXjA10TZZ0HXAcqtjIJt4WHb5eOsyjQe/gNwoXSS2dJOvwMQWT ng08JKYvFcp9umIUcBX7r/2YbMwClIOTyLIlORBmZF5qhedOIjL1BhlaQ9QJJJ4DQbS9 Phpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id g75si272809qke.10.2018.01.03.14.08.56; Wed, 03 Jan 2018 14:08:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 94038614E1; Wed, 3 Jan 2018 22:08:56 +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, 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 E78EE6150B; Wed, 3 Jan 2018 22:01:14 +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 A1503609E7; Wed, 3 Jan 2018 22:00:29 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 8524F609AA for ; Wed, 3 Jan 2018 22:00:16 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 5851F5102E9F for ; Thu, 4 Jan 2018 01:00:15 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 5u9FfyOewd-0FSGKQQg; Thu, 04 Jan 2018 01:00:15 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hqAp3CL4cC-0E4Kfk1j; Thu, 04 Jan 2018 01:00:14 +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, 4 Jan 2018 01:00:05 +0300 Message-Id: <1515016810-26637-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515016810-26637-1-git-send-email-odpbot@yandex.ru> References: <1515016810-26637-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v11 8/13] test, linux-gen: use common test/Makefile.inc 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 Populate test/Makefile.inc with more variables, allowing us to drop platform test/Makefile.inc. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3c1b82834c36bc66d397aedd2f80da45160eae2d **/ platform/linux-generic/test/Makefile.inc | 22 ---------------------- platform/linux-generic/test/ring/Makefile.am | 4 +--- .../linux-generic/test/validation/Makefile.inc | 1 - .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 6 ------ test/Makefile.inc | 9 +++++++++ test/validation/api/Makefile.inc | 11 ----------- 7 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 platform/linux-generic/test/Makefile.inc delete mode 100644 platform/linux-generic/test/validation/Makefile.inc diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc deleted file mode 100644 index dd21917eb..000000000 --- a/platform/linux-generic/test/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -# The following definitions may be used by platform tests that wish to -# build specific ODP applications, (i.e those whose do more than validation -# test wrapping) - -AM_LDFLAGS = -static - -AM_CFLAGS = $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la -LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) - -INCCUNIT_COMMON = -I$(top_srcdir)/test/common -INCODP = \ - -I$(top_builddir)/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 376047559..95e5e87f4 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,4 +1,4 @@ -include ../Makefile.inc +include $(top_srcdir)/test/Makefile.inc test_PROGRAMS = ring_main ring_main_SOURCES = \ @@ -6,6 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ - $(INCCUNIT_COMMON) $(INCODP) ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/platform/linux-generic/test/validation/Makefile.inc b/platform/linux-generic/test/validation/Makefile.inc deleted file mode 100644 index b9030850c..000000000 --- a/platform/linux-generic/test/validation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/platform/linux-generic/test/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc index c47217d1a..cda6237ea 100644 --- a/platform/linux-generic/test/validation/api/Makefile.inc +++ b/platform/linux-generic/test/validation/api/Makefile.inc @@ -1 +1 @@ -include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc +include $(top_srcdir)/test/validation/api/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 131a511be..f75cbc976 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -10,13 +10,7 @@ shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da214..d4d74c25e 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,5 +1,13 @@ LIB = $(top_builddir)/lib +COMMON_DIR = $(top_builddir)/test/common + +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la + #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. @@ -16,6 +24,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS) AM_LDFLAGS = -L$(LIB) -static diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 4af010002..871a37796 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,13 +1,2 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) - -AM_CFLAGS += $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la