[API-NEXT,v1,13/19] test: misc rewrites in Makefile.am files

Message ID 1505156408-13887-14-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Untitled series #3957
Related show

Commit Message

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


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

Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** Email created from pull request 173 (muvarov:api-next)
 ** https://github.com/Linaro/odp/pull/173
 ** Patch: https://github.com/Linaro/odp/pull/173.patch
 ** Base sha: 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869
 ** Merge commit sha: 057be0905a62a157cc96a91743ea70e66e8554ca
 **/
 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 +-
 test/linux-generic/pktio_ipc/Makefile.am     | 3 ---
 6 files changed, 6 insertions(+), 17 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..ef9537b1 100644
--- a/test/common_plat/performance/Makefile.am
+++ b/test/common_plat/performance/Makefile.am
@@ -24,14 +24,6 @@  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
-
 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)
diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am
index eaa8bdd6..4287fbc0 100644
--- a/test/linux-generic/pktio_ipc/Makefile.am
+++ b/test/linux-generic/pktio_ipc/Makefile.am
@@ -4,9 +4,6 @@  TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
 test_PROGRAMS = pktio_ipc1\
 		pktio_ipc2
 
-pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
-pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
-
 pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h
 pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h