From patchwork Thu Oct 5 10:00:04 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: 114877 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp56681edb; Thu, 5 Oct 2017 03:13:04 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAp07+ToiAJ2mJ7XDudShIpNvi0APMNo6Ce8WJOld/SlOTcWnDtLNqocVrKZoJJ7lrk6ynP X-Received: by 10.55.46.196 with SMTP id u187mr29126777qkh.174.1507198384681; Thu, 05 Oct 2017 03:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198384; cv=none; d=google.com; s=arc-20160816; b=ukvMyd8VsjARWPYCz4kRAtIvP4z0+hJ1w0zevLV7NtYl18kz+L46FpqZCKDySeHTcs t6W1CeyhaynkUz84wuZTKa3+B14M5b4ZX3ez+s54iBvVDRJq7VCryLhjZju5mARIF1qE 1aKXpxxksbaSDNYBTr1YpSKKQ8HMxyZnyJq4XlGLkySNGtJYo79XhY8l96YoUeGG7U5H Q1XhovJKUakHnX3HFbcPSiQcNGmzIVoNU1o+UUONvFWkVVUlu6qTbC7Qx2gjuMI5lFfR tvv3Tgo0SYZFmPaEpmVYc5rScW+eQE3/badcukMzg8E2CPcCJWBIAGHEPtTN1D8Cq7sC 0VXw== 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=UG0PEI+IAwL1XpbLjcbgAXaulPkqBAtWfsSisvJlDGo=; b=tqks+Vqjd7FNtJ5jC9u3bbpAQwoGDJmhZ4tg8VjBXUICx4nyraaNNv3fNhYLg7SVIT OulokMNB7qhDhop1bkxCTsv7HwESuNMw8EBYmx6MR0sc5j1+rSD7TSz+c8mUAZ1CvSir amcA9fGhq4FfnTgOIm2rRT67+WPXr9ztbOuXVDcQigcfcdFNKrt05euhcc6inAyf5Gof C92Y4sodK1AzhLX57fgLN71HlPTKghe0ystzFmbz7G53bbibq49daaRgtD+Tq+GjqzK9 3NYsUrsJBImRdGx72MMUUirxHOZWIFGF+6iE8xbubUVZLMRvsSaRujHYPC/4GO7ccXzS jZSw== 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 d5si6310478qtb.132.2017.10.05.03.13.04; Thu, 05 Oct 2017 03:13:04 -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 3E083644D6; Thu, 5 Oct 2017 10:13:04 +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 CD187644C0; Thu, 5 Oct 2017 10:03:01 +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 712BE61E64; Thu, 5 Oct 2017 10:02:51 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id DC98661E03 for ; Thu, 5 Oct 2017 10:00:32 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 67587785BC6 for ; Thu, 5 Oct 2017 13:00:31 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rZUTUJyMZh-0V8GAo6j; Thu, 05 Oct 2017 13:00:31 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0UqKP15m; Thu, 05 Oct 2017 13:00:30 +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, 5 Oct 2017 13:00:04 +0300 Message-Id: <1507197617-6215-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 7/20] test: move test/common_plat/common to test_common dir 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 In preparation for reworking tests, move test-related libraries to top-level directory. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: f77d26100249d410e863b9db7a1a41fdad922e03 **/ Makefile.am | 1 + test/common_plat/Makefile.am | 8 +------- test/common_plat/m4/configure.m4 | 4 ++-- test/common_plat/validation/api/Makefile.inc | 4 ++-- test/linux-generic/Makefile.inc | 4 ++-- {test/common_plat/common => test_common}/Makefile.am | 4 ++++ {test/common_plat/common => test_common}/mask_common.c | 0 {test/common_plat/common => test_common}/mask_common.h | 0 {test/common_plat/common => test_common}/odp_cunit_common.c | 0 {test/common_plat/common => test_common}/odp_cunit_common.h | 0 10 files changed, 12 insertions(+), 13 deletions(-) rename {test/common_plat/common => test_common}/Makefile.am (94%) rename {test/common_plat/common => test_common}/mask_common.c (100%) rename {test/common_plat/common => test_common}/mask_common.h (100%) rename {test/common_plat/common => test_common}/odp_cunit_common.c (100%) rename {test/common_plat/common => test_common}/odp_cunit_common.h (100%) diff --git a/Makefile.am b/Makefile.am index 6c43679e7..774c09bda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ SUBDIRS = @platform_with_platform@ \ helper/test \ doc \ example . \ + test_common \ test @DX_RULES@ diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am index af78bb653..80c35f870 100644 --- a/test/common_plat/Makefile.am +++ b/test/common_plat/Makefile.am @@ -1,7 +1 @@ -SUBDIRS = - -if cunit_support -SUBDIRS += common -endif - -SUBDIRS += performance miscellaneous validation +SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index be878bd7d..e04737e18 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -2,8 +2,8 @@ m4_include([test/common_plat/m4/miscellaneous.m4]) m4_include([test/common_plat/m4/performance.m4]) m4_include([test/common_plat/m4/validation.m4]) -AC_CONFIG_FILES([test/common_plat/Makefile - test/common_plat/common/Makefile +AC_CONFIG_FILES([test_common/Makefile + test/common_plat/Makefile test/common_plat/miscellaneous/Makefile test/common_plat/performance/Makefile test/common_plat/validation/Makefile diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index c4e80eb72..eb5ef34c1 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,8 +1,8 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common_plat/common +COMMON_DIR = $(top_builddir)/test_common -AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common +AM_CFLAGS += -I$(top_srcdir)/test_common AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index cfb614419..2aba84d28 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -6,11 +6,11 @@ AM_LDFLAGS = -static AM_CFLAGS = $(CUNIT_CFLAGS) -LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la +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_plat/common +INCCUNIT_COMMON = -I$(top_srcdir)/test_common INCODP = \ -I$(top_builddir)/include \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/common_plat/common/Makefile.am b/test_common/Makefile.am similarity index 94% rename from test/common_plat/common/Makefile.am rename to test_common/Makefile.am index 5736214a0..dee3404cd 100644 --- a/test/common_plat/common/Makefile.am +++ b/test_common/Makefile.am @@ -1,3 +1,5 @@ +if cunit_support + include $(top_srcdir)/test/Makefile.inc noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la @@ -9,3 +11,5 @@ libcpumask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK + +endif diff --git a/test/common_plat/common/mask_common.c b/test_common/mask_common.c similarity index 100% rename from test/common_plat/common/mask_common.c rename to test_common/mask_common.c diff --git a/test/common_plat/common/mask_common.h b/test_common/mask_common.h similarity index 100% rename from test/common_plat/common/mask_common.h rename to test_common/mask_common.h diff --git a/test/common_plat/common/odp_cunit_common.c b/test_common/odp_cunit_common.c similarity index 100% rename from test/common_plat/common/odp_cunit_common.c rename to test_common/odp_cunit_common.c diff --git a/test/common_plat/common/odp_cunit_common.h b/test_common/odp_cunit_common.h similarity index 100% rename from test/common_plat/common/odp_cunit_common.h rename to test_common/odp_cunit_common.h