[v11,8/13] test, linux-gen: use common test/Makefile.inc

Message ID 1515016810-26637-9-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series
  • Misc fixes
Related show

Commit Message

Github ODP bot Jan. 3, 2018, 10 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Populate test/Makefile.inc with more variables, allowing us to drop
platform test/Makefile.inc.

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

---
/** 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

Patch

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