[PATCH i-g-t 00/12] meson: Build more tools and install more stuff

[PATCH i-g-t 00/12] meson: Build more tools and install more stuff

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

This series makes meson install a bunch of missing tools, and tries
to unify a bit more what meson vs. autotools installs.

Notable differences left after this series:
* asm/disasm missing from meson
* intel_aubdump script missing from meson
* some benchmarks/tests missing from meson
* test-list-full.txt missing from meson
* meson installs a few intel_reg reg files
* meson installs a pile of igt_* binaries missing from autotools
* meson installs a pile of headers missing from autotools

Also I noticed that the git sha1 things seems totally broken for
meson atm, unless you do an autotools build first.

Ville Syrjälä (12):
  meson: Install tests into $libexecdir
  meson: Install tools
  tools/intel_reg: s/PKGDATADIR/IGT_DATADIR/
  meson: Build and install intel_reg
  meson: Install intel_reg register definitions
  meson: Install test-list.txt
  meson: Install test image files
  meson: Build and install intel_l3_parity
  meson: Build and install intel_dp_compliance
  meson: Drop the 'lib' prefix from intel_aubdump.so
  meson: Rename and install intel-gpu-overlay
  meson: Install intel_gpu_abrt

 overlay/meson.build        |  5 +++--
 tests/generate_testlist.sh |  9 ++++++---
 tests/meson.build          | 26 +++++++++++++++++++++++---
 tools/Makefile.am          |  2 +-
 tools/intel_reg.c          |  2 +-
 tools/meson.build          | 37 +++++++++++++++++++++++++++++++++++--
 6 files changed, 69 insertions(+), 12 deletions(-)

-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 01/12] meson: Install tests into $libexecdir

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

autotools installs the tests into $libexecdir. Make meson do the same.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/meson.build | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/meson.build b/tests/meson.build
index 4dd5a9c9d4c7..1f98f2a02bb9 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -255,13 +255,19 @@ if alsa.found() and gsl.found()
 	test_deps += alsa
 endif
 
+libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'intel-gpu-tools')
+
 foreach prog : test_progs
 	executable(prog, prog + '.c',
-			dependencies : test_deps)
+		   dependencies : test_deps,
+		   install_dir : libexecdir,
+		   install : true)
 endforeach
 
 executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'],
-		dependencies : test_deps)
+           dependencies : test_deps,
+	   install_dir : libexecdir,
+	   install : true)
 test_progs += 'testdisplay'
 
 run_command('generate_testlist.sh', test_progs)
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 02/12] meson: Install tools

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/meson.build b/tools/meson.build
index d2d4410e2130..3b6d6376d2d6 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -51,7 +51,8 @@ endif
 
 foreach prog : tools_progs
 	executable(prog, prog + '.c',
-			dependencies : tool_deps)
+		   dependencies : tool_deps,
+		   install : true)
 endforeach
 
 shared_library('intel_aubdump', 'aubdump.c', dependencies : [ igt_deps, dlsym ])
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 03/12] tools/intel_reg: s/PKGDATADIR/IGT_DATADIR/

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We use IGT_DATADIR to refer to $pkgdatadir elsewhere, so let's have
intel_reg follow suit.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/Makefile.am | 2 +-
 tools/intel_reg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2c7b57997447..35732c178fd1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,7 +17,7 @@ SUBDIRS = null_state_gen registers
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
 AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
-	    $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\" \
+	    $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DIGT_DATADIR=\"$(pkgdatadir)\" \
 	    $(WERROR_CFLAGS) -D_GNU_SOURCE
 LDADD = $(top_builddir)/lib/libintel_tools.la
 AM_LDFLAGS = -Wl,--as-needed
diff --git a/tools/intel_reg.c b/tools/intel_reg.c
index b3823fd82dd3..d6f8184027a6 100644
--- a/tools/intel_reg.c
+++ b/tools/intel_reg.c
@@ -713,7 +713,7 @@ static int read_reg_spec(struct config *config)
 		path = getenv("INTEL_REG_SPEC");
 
 	if (!path)
-		path = PKGDATADIR"/registers";
+		path = IGT_DATADIR"/registers";
 
 	r = stat(path, &st);
 	if (r) {
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 04/12] meson: Build and install intel_reg

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/meson.build b/tools/meson.build
index 3b6d6376d2d6..9d08a0d1f986 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -55,6 +55,16 @@ foreach prog : tools_progs
 		   install : true)
 endforeach
 
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
+
+intel_reg_src = [ 'intel_reg.c', 'intel_reg_decode.c', 'intel_reg_spec.c' ]
+executable('intel_reg', sources : intel_reg_src,
+           dependencies : tool_deps,
+	   install : true,
+           c_args : [
+	     '-DIGT_DATADIR="@0@"'.format(pkgdatadir),
+	   ])
+
 shared_library('intel_aubdump', 'aubdump.c', dependencies : [ igt_deps, dlsym ])
 
 subdir('null_state_gen')
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 05/12] meson: Install intel_reg register definitions

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

FIXME: install_subdir exclude_files knob seems to require meson 0.42+.
Is that acceptable?

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/meson.build b/tools/meson.build
index 9d08a0d1f986..b6052a0c71c3 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -65,6 +65,11 @@ executable('intel_reg', sources : intel_reg_src,
 	     '-DIGT_DATADIR="@0@"'.format(pkgdatadir),
 	   ])
 
+install_subdir('registers', install_dir : pkgdatadir,
+               exclude_files : [
+		 'Makefile', 'Makefile.in', 'Makefile.am',
+	       ])
+
 shared_library('intel_aubdump', 'aubdump.c', dependencies : [ igt_deps, dlsym ])
 
 subdir('null_state_gen')
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 06/12] meson: Install test-list.txt

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/generate_testlist.sh | 9 ++++++---
 tests/meson.build          | 9 ++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/generate_testlist.sh b/tests/generate_testlist.sh
index 6ea78655daca..a0d53e9ff095 100755
--- a/tests/generate_testlist.sh
+++ b/tests/generate_testlist.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
-echo TESTLIST > $MESON_BUILD_ROOT/tests/test-list.txt
+OUTPUT=$1
+shift
+
+echo TESTLIST > $OUTPUT
 
 while [[ $# -gt 0 ]] ; do
-	echo $1 >> $MESON_BUILD_ROOT/tests/test-list.txt
+	echo $1 >> $OUTPUT
 	shift
 done
 
-echo END TESTLIST >> $MESON_BUILD_ROOT/tests/test-list.txt
+echo END TESTLIST >> $OUTPUT
diff --git a/tests/meson.build b/tests/meson.build
index 1f98f2a02bb9..37c4c4c24fa5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -270,7 +270,14 @@ executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'],
 	   install : true)
 test_progs += 'testdisplay'
 
-run_command('generate_testlist.sh', test_progs)
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
+
+gen_testlist = find_program('generate_testlist.sh')
+custom_target('testlist',
+	      output : 'test-list.txt',
+	      command : [ gen_testlist, '@OUTPUT@', test_progs ],
+	      install : true,
+	      install_dir : pkgdatadir)
 
 test_script = find_program('igt_command_line.sh')
 foreach prog : test_progs
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 07/12] meson: Install test image files

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/meson.build | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/meson.build b/tests/meson.build
index 37c4c4c24fa5..df315de2713c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -301,3 +301,10 @@ foreach prog : hang_progs
 			dependencies : igt_deps,
 			install : false)
 endforeach
+
+image_files = [
+  '1080p-left.png',
+  '1080p-right.png',
+  'pass.png',
+]
+install_data(sources : image_files, install_dir : pkgdatadir)
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 08/12] meson: Build and install intel_l3_parity

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/meson.build b/tools/meson.build
index b6052a0c71c3..66dd697973c3 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,6 +57,11 @@ endforeach
 
 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
 
+intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ]
+executable('intel_l3_parity', sources : intel_l3_parity_src,
+           dependencies : tool_deps,
+	   install : true)
+
 intel_reg_src = [ 'intel_reg.c', 'intel_reg_decode.c', 'intel_reg_spec.c' ]
 executable('intel_reg', sources : intel_reg_src,
            dependencies : tool_deps,
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 09/12] meson: Build and install intel_dp_compliance

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/meson.build b/tools/meson.build
index 66dd697973c3..bf24602396f1 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,6 +57,11 @@ endforeach
 
 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
 
+intel_dp_compliance_src = [ 'intel_dp_compliance.c', 'intel_dp_compliance_hotplug.c' ]
+executable('intel_dp_compliance', sources : intel_dp_compliance_src,
+           dependencies : tool_deps,
+	   install : true)
+
 intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ]
 executable('intel_l3_parity', sources : intel_l3_parity_src,
            dependencies : tool_deps,
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 10/12] meson: Drop the 'lib' prefix from intel_aubdump.so

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Autotools didn't add the 'lib' prefix to the intel_aubdump.so filename.
Coerce meson to match that.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/meson.build b/tools/meson.build
index bf24602396f1..0e64621d1d45 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -80,6 +80,9 @@ install_subdir('registers', install_dir : pkgdatadir,
 		 'Makefile', 'Makefile.in', 'Makefile.am',
 	       ])
 
-shared_library('intel_aubdump', 'aubdump.c', dependencies : [ igt_deps, dlsym ])
+shared_library('intel_aubdump', 'aubdump.c',
+	       dependencies : [ igt_deps, dlsym ],
+	       name_prefix : '',
+	       install : true)
 
 subdir('null_state_gen')
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 11/12] meson: Rename and install intel-gpu-overlay

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Autotools called the binary 'intel-gpu-overlay', let's have meson use
that name as well. Also install it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 overlay/meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/overlay/meson.build b/overlay/meson.build
index a4b778ca5a86..a92ef89542d3 100644
--- a/overlay/meson.build
+++ b/overlay/meson.build
@@ -52,8 +52,9 @@ gpu_overlay_src += both_x11_src
 gpu_overlay_src += 'kms/kms-overlay.c'
 
 if xrandr.found() and cairo.found()
-	executable('intel_gpu_overlay', gpu_overlay_src,
+	executable('intel-gpu-overlay', gpu_overlay_src,
 			include_directories : inc,
 			c_args : gpu_overlay_cflags,
-			dependencies : gpu_overlay_deps)
+			dependencies : gpu_overlay_deps,
+			install : true)
 endif
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 12/12] meson: Install intel_gpu_abrt

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tools/meson.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/meson.build b/tools/meson.build
index 0e64621d1d45..84b3467a6d72 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -75,6 +75,10 @@ executable('intel_reg', sources : intel_reg_src,
 	     '-DIGT_DATADIR="@0@"'.format(pkgdatadir),
 	   ])
 
+bindir = join_paths(get_option('prefix'), get_option('bindir'))
+
+install_data('intel_gpu_abrt', install_dir : bindir)
+
 install_subdir('registers', install_dir : pkgdatadir,
                exclude_files : [
 		 'Makefile', 'Makefile.in', 'Makefile.am',
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for meson: Build more tools and install more stuff

[Patchwork]

== Series Details ==

Series: meson: Build more tools and install more stuff
URL   : https://patchwork.freedesktop.org/series/30155/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
f9e0154630766b63617c64255a68e5129e233a4b igt/gem_evict_(alignment,everything): Limit to low 4G

with latest DRM-Tip kernel build CI_DRM_3072
31d271f5a5d0 drm-tip: 2017y-09m-11d-17h-13m-48s UTC integration manifest

Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                pass       -> FAIL       (fi-snb-2600) fdo#100215 +1
Test kms_flip:
        Subgroup basic-flip-vs-modeset:
                skip       -> PASS       (fi-skl-x1585l) fdo#101781

fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:455s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:382s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:545s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:273s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:508s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:506s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:507s
fi-cfl-s         total:289  pass:250  dwarn:4   dfail:0   fail:0   skip:35  time:459s
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:465s
fi-glk-2a        total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:594s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:431s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:409s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:438s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:486s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:465s
fi-kbl-7500u     total:289  pass:263  dwarn:1   dfail:0   fail:1   skip:24  time:482s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:577s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:584s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:555s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:459s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:517s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:503s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:464s
fi-skl-x1585l    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:510s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:577s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:1   skip:39  time:441s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_172/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: failure for meson: Build more tools and install more stuff

[Patchwork]

== Series Details ==

Series: meson: Build more tools and install more stuff
URL   : https://patchwork.freedesktop.org/series/30155/
State : failure

== Summary ==

Test kms_cursor_legacy:
        Subgroup flip-vs-cursor-varying-size:
                pass       -> FAIL       (shard-hsw)
Test drv_suspend:
        Subgroup fence-restore-untiled-hibernate:
                fail       -> DMESG-FAIL (shard-hsw) k.org#196691

k.org#196691 https://bugzilla.kernel.org/show_bug.cgi?id=196691

shard-hsw        total:2301 pass:1234 dwarn:0   dfail:1   fail:14  skip:1052 time:9440s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_172/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 01/12] meson: Install tests into $libexecdir

[Jordan Justen]

On 2017-09-11 10:24:56, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> autotools installs the tests into $libexecdir. Make meson do the same.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  tests/meson.build | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 4dd5a9c9d4c7..1f98f2a02bb9 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -255,13 +255,19 @@ if alsa.found() and gsl.found()
>         test_deps += alsa
>  endif
>  
> +libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'intel-gpu-tools')
> +
>  foreach prog : test_progs
>         executable(prog, prog + '.c',
> -                       dependencies : test_deps)
> +                  dependencies : test_deps,
> +                  install_dir : libexecdir,
> +                  install : true)
>  endforeach
>  
>  executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'],
> -               dependencies : test_deps)
> +           dependencies : test_deps,
> +          install_dir : libexecdir,
> +          install : true)

I noticed indentation alignment issues, like this one, in many of the
patches. (Often when adding 'install : true')

Can you review and fix the alignment on all patches?

Series Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

>  test_progs += 'testdisplay'
>  
>  run_command('generate_testlist.sh', test_progs)
> -- 
> 2.13.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 01/12] meson: Install tests into $libexecdir

[Ville Syrjälä]

On Thu, Sep 14, 2017 at 11:04:14AM -0700, Jordan Justen wrote:
> On 2017-09-11 10:24:56, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > autotools installs the tests into $libexecdir. Make meson do the same.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  tests/meson.build | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 4dd5a9c9d4c7..1f98f2a02bb9 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -255,13 +255,19 @@ if alsa.found() and gsl.found()
> >         test_deps += alsa
> >  endif
> >  
> > +libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'intel-gpu-tools')
> > +
> >  foreach prog : test_progs
> >         executable(prog, prog + '.c',
> > -                       dependencies : test_deps)
> > +                  dependencies : test_deps,
> > +                  install_dir : libexecdir,
> > +                  install : true)
> >  endforeach
> >  
> >  executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'],
> > -               dependencies : test_deps)
> > +           dependencies : test_deps,
> > +          install_dir : libexecdir,
> > +          install : true)
> 
> I noticed indentation alignment issues, like this one, in many of the
> patches. (Often when adding 'install : true')
> 
> Can you review and fix the alignment on all patches?

Looks like there's something fishy going on with emacs meson-mode. It
uses spaces to indent one line and for other lines it uses tabs.

Hmm. OK, so it looks like if there's already 8 spaces on the line it
won't convert them to tabs when I ask it reindent things. That's a bit
strange. I'll go through the rest of the patches and try to fix that
up.

> 
> Series Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

Thanks.

> 
> >  test_progs += 'testdisplay'
> >  
> >  run_command('generate_testlist.sh', test_progs)
> > -- 
> > 2.13.5
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx