Patchwork [i-g-t,4/6] meson: Install test-list.txt to libexecdir

login
register
mail settings
Submitter Petri Latvala
Date Dec. 7, 2017, 1:40 p.m.
Message ID <1512654031-22342-4-git-send-email-petri.latvala@intel.com>
Download mbox | patch
Permalink /patch/10099063/
State New
Headers show

Comments

Petri Latvala - Dec. 7, 2017, 1:40 p.m.
Piglit needs test-list.txt to be in the same directory as the test
binaries.

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ville Syrjälä - Dec. 7, 2017, 4:29 p.m.
On Thu, Dec 07, 2017 at 03:40:29PM +0200, Petri Latvala wrote:
> Piglit needs test-list.txt to be in the same directory as the test
> binaries.

Referencing the corresponding autotools commit would have made this
easier to review...

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  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
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch

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