Piglit expects test-list*.txt files to be in the same directory as the test binaries. Installing non-executable files to libexecdir requires going around some of autotools' sanity checks.
This change should make 'make install':ed IGT runnable with piglit. Signed-off-by: Petri Latvala <[email protected]> Cc: Tomi Sarvela <[email protected]> Cc: Arkadiusz Hiler <[email protected]> --- tests/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 726e2b2..b96e96a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,6 +50,16 @@ pkglibexec_PROGRAMS = \ $(TESTS_progs_X) \ $(NULL) +# Piglit expects test-list*.txt to be in the same directory as the +# tests. pkglibexec_DATA is an invalid combo to autotools, so work +# around that by defining a new directory variable that is the same as +# libexec directory and install the .txt files there. +wrap_libexecdir = $(pkglibexecdir) +wrap_libexec_DATA = \ + test-list.txt \ + test-list-full.txt \ + $(NULL) + dist_pkglibexec_SCRIPTS = \ $(TESTS_scripts) \ $(scripts) \ @@ -63,8 +73,6 @@ all-local: .gitignore .gitignore: Makefile.sources @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@ -pkgdata_DATA = test-list.txt test-list-full.txt - EXTRA_PROGRAMS = $(HANG) EXTRA_DIST = $(common_files) $(check_SCRIPTS) -- 2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
