[Intel-gfx] [PATCH i-g-t v2] tests: install test programs to libexec

Joonas Lahtinen joonas.lahtinen at linux.intel.com
Thu Mar 26 09:05:27 PDT 2015


Install the test programs by default so that they can be packaged.

v2:
- Install more tests including scripts and their data

Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
---
 tests/Makefile.am      | 22 +++++++++++++++++++---
 tests/Makefile.sources | 10 ++++++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ae2541..12675b5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,10 +27,26 @@ multi-tests.txt: Makefile.sources
 	@echo ${multi_kernel_tests} >> $@
 	@echo END TESTLIST >> $@
 
-EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
-EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
+libexec_PROGRAMS += \
+	$(TESTS_progs) \
+	$(TESTS_progs_M) \
+	$(HANG) \
+	$(NULL)
+
+libexec_SCRIPTS += \
+	$(TESTS_scripts) \
+	$(TESTS_scripts_M) \
+	$(scripts) \
+	$(NULL)
+
+# We do want the data to be at the same directory as executables.
+igt_tests_datadir = $(libexecdir)
+igt_tests_data_DATA = \
+	$(IMAGES) \
+	$(common_files) \
+	$(NULL)
 
-CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt
+CLEANFILES = single-tests.txt multi-tests.txt
 
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. \
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 0a974a6..8d4e243 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -1,12 +1,18 @@
 noinst_PROGRAMS = \
 	gem_alive \
 	gem_stress \
-	$(TESTS_progs) \
-	$(TESTS_progs_M) \
 	$(HANG) \
 	$(TESTS_testsuite) \
 	$(NULL)
 
+libexec_PROGRAMS = \
+	$(TESTS_progs) \
+	$(TESTS_progs_M) \
+	$(NULL)
+
+libexec_SCRIPTS = \
+	$(NULL)
+
 NOUVEAU_TESTS_M = \
 	prime_nv_api \
 	prime_nv_pcopy \
-- 
1.9.3




More information about the Intel-gfx mailing list