[v4,11/20] test: move test_debug.h to test_common

Message ID 1507316415-2144-12-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Another build system update
Related show

Commit Message

Github ODP bot Oct. 6, 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 213 (lumag:plat-def)
 ** https://github.com/Linaro/odp/pull/213
 ** Patch: https://github.com/Linaro/odp/pull/213.patch
 ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68
 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383
 **/
 test/Makefile.inc                        | 2 +-
 test/common_plat/performance/Makefile.am | 3 ---
 test_common/Makefile.am                  | 1 +
 {test => test_common}/test_debug.h       | 0
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename {test => test_common}/test_debug.h (100%)

Patch

diff --git a/test/Makefile.inc b/test/Makefile.inc
index a45fcf870..b39cbc4fd 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -12,7 +12,7 @@  INCFLAGS = \
 	-I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \
 	-I$(top_srcdir)/platform/@with_platform@/include \
 	-I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \
-	-I$(top_srcdir)/test \
+	-I$(top_srcdir)/test_common \
 	-I$(top_builddir)/include
 
 AM_CPPFLAGS = $(INCFLAGS)
diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am
index ef9537b1b..8d9fd3593 100644
--- a/test/common_plat/performance/Makefile.am
+++ b/test/common_plat/performance/Makefile.am
@@ -24,9 +24,6 @@  endif
 
 bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
 
-noinst_HEADERS = \
-		  $(top_srcdir)/test/test_debug.h
-
 odp_bench_packet_SOURCES = odp_bench_packet.c
 odp_crypto_SOURCES = odp_crypto.c
 odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dummy_crc.h
diff --git a/test_common/Makefile.am b/test_common/Makefile.am
index 3262a6ce1..2759e8ecb 100644
--- a/test_common/Makefile.am
+++ b/test_common/Makefile.am
@@ -24,4 +24,5 @@  libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK
 
 endif
 
+noinst_HEADERS = test_debug.h
 dist_test_SCRIPTS = run-test.sh
diff --git a/test/test_debug.h b/test_common/test_debug.h
similarity index 100%
rename from test/test_debug.h
rename to test_common/test_debug.h