[Intel-gfx] [PATCH i-g-t v2 1/1] meson: Install test-list.txt to libexecdir

Petri Latvala petri.latvala at intel.com
Tue Dec 12 10:50:07 UTC 2017


Piglit needs test-list.txt to be in the same directory as the test
binaries. The corresponding change to autotools was done in commit

 commit 23b7c99c8f6b2da9f624d4f0c40fe1355d5a2dcc
 Author: Petri Latvala <petri.latvala at intel.com>
 Date:   Fri Aug 25 13:13:51 2017 +0300

 tests/Makefile.am: Install test-list*.txt to libexecdir

 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.

Same reasoning for the install directory applies.

v2: Expand commit message to explain the reason.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com> #v1
---
 tests/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index 191ac4ce..45517a59 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -285,7 +285,7 @@ test_list = custom_target('testlist',
 	      output : 'test-list.txt',
 	      command : [ gen_testlist, '@OUTPUT@', test_progs ],
 	      install : true,
-	      install_dir : pkgdatadir)
+	      install_dir : libexecdir)
 
 test_script = find_program('igt_command_line.sh')
 foreach prog : test_progs
-- 
2.14.1



More information about the Intel-gfx mailing list