[v1,11/11] test: misc rewrites in Makefile.am files

Message ID 1504638007-2671-12-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Untitled series #3816
Related show

Commit Message

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


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

---
/** 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: c9bd3cdd91bd495988653511548fd4525579db79
 **/
 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 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

Patch

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..a61addd4 100644
--- a/test/common_plat/performance/Makefile.am
+++ b/test/common_plat/performance/Makefile.am
@@ -24,13 +24,7 @@  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
+AM_CPPFLAGS += -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)