[v3,7/20] test: move test/common_plat/common to test_common dir

Message ID 1507226415-26756-8-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Another build system update
Related show

Commit Message

Github ODP bot Oct. 5, 2017, 6 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


In preparation for reworking tests, move test-related libraries to
top-level directory.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** 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: 4157d06d3a16265d7d6152d7ae4918ec5623c10c
 **/
 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%)

Patch

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