[Intel-gfx] [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources

robert.foss at collabora.com robert.foss at collabora.com
Thu Jun 23 09:34:27 UTC 2016


From: Robert Foss <robert.foss at collabora.com>

Replace the automake specific names of listings with something that isn't
automake specific.

Signed-off-by: Robert Foss <robert.foss at collabora.com>
---
 lib/tests/Android.mk       | 2 +-
 lib/tests/Makefile.am      | 3 +++
 lib/tests/Makefile.sources | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk
index df8e159..026f17f 100644
--- a/lib/tests/Android.mk
+++ b/lib/tests/Android.mk
@@ -37,5 +37,5 @@ IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm
 IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
 IGT_LOCAL_SHARED_LIBRARIES := libpciaccess libdrm libdrm_intel
 
-$(foreach item,$(check_PROGRAMS),$(eval $(call add_test,$(item))))
+$(foreach item,$($(check_prog_list)),$(eval $(call add_test,$(item))))
 
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 582cc3e..c2fa2eb 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -1,5 +1,8 @@
 include Makefile.sources
 
+check_PROGRAMS = $(check_prog_list)
+check_SCRIPTS = $(check_script_list)
+
 AM_TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir)
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index 707c445..5d8c785 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -1,4 +1,4 @@
-check_PROGRAMS = \
+check_prog_list = \
 	igt_no_exit \
 	igt_no_exit_list_only \
 	igt_fork_helper \
@@ -15,13 +15,13 @@ check_PROGRAMS = \
 	igt_exit_handler \
 	$(NULL)
 
-check_SCRIPTS = \
+check_script_list = \
 	igt_command_line.sh \
 	$(NULL)
 
 TESTS = \
-	$(check_PROGRAMS) \
-	$(check_SCRIPTS) \
+	$(check_prog_list) \
+	$(check_script_list) \
 	$(NULL)
 
 # Test that exercise specific asserts in the test framework library and are
-- 
2.7.4



More information about the Intel-gfx mailing list