[igt-dev] [PATCH i-g-t v2] meson: Move MSM-specific tests to their own subdirectory

[Jessica Zhang]

Move all custom MSM tests to their own subdirectory and have them
installed in an msm/ subdirectory

Changes from v1:
- Removed extra whitespace
- Moved meson build commands for msm tests from tests/msm/meson.build
  to tests/meson.build
---
 meson.build                    |  8 ++++++++
 tests/meson.build              | 18 +++++++++++++++---
 tests/{ => msm}/msm_mapping.c  |  0
 tests/{ => msm}/msm_recovery.c |  0
 tests/{ => msm}/msm_submit.c   |  0
 5 files changed, 23 insertions(+), 3 deletions(-)
 rename tests/{ => msm}/msm_mapping.c (100%)
 rename tests/{ => msm}/msm_recovery.c (100%)
 rename tests/{ => msm}/msm_submit.c (100%)

diff --git a/meson.build b/meson.build
index 3e937f5a5b98..5d6f5d5686bb 100644
--- a/meson.build
+++ b/meson.build
@@ -260,6 +260,7 @@ includedir = get_option('includedir')
 libdir = get_option('libdir')
 libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools')
 amdgpudir = join_paths(libexecdir, 'amdgpu')
+msmdir = join_paths(libexecdir, 'msm')
 mandir = get_option('mandir')
 pkgconfigdir = join_paths(libdir, 'pkgconfig')
 python3 = find_program('python3', required : true)
@@ -295,10 +296,17 @@ if get_option('use_rpath')
 		amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, '..')
 	endforeach
 	amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, libdir)
+
+	msmdir_rpathdir = '$ORIGIN'
+	foreach p : msmdir.split('/')
+		msmdir_rpathdir = join_paths(msmdir_rpathdir, '..')
+	endforeach
+	msmdir_rpathdir = join_paths(msmdir_rpathdir, libdir)
 else
 	bindir_rpathdir = ''
 	libexecdir_rpathdir = ''
 	amdgpudir_rpathdir = ''
+	msmdir_rpathdir = ''
 endif
 
 subdir('lib')
diff --git a/tests/meson.build b/tests/meson.build
index 7261e9aa2950..fb0f1e37f633 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -63,9 +63,6 @@ test_progs = [
 	'kms_vrr',
 	'kms_writeback',
 	'meta_test',
-	'msm_mapping',
-	'msm_recovery',
-	'msm_submit',
 	'panfrost_get_param',
 	'panfrost_gem_new',
 	'panfrost_prime',
@@ -253,6 +250,12 @@ i915_progs = [
 	'sysfs_timeslice_duration',
 ]
 
+msm_progs = [
+	'msm_mapping',
+	'msm_recovery',
+	'msm_submit'
+]
+
 test_deps = [ igt_deps ]
 
 if libdrm_nouveau.found()
@@ -294,6 +297,15 @@ foreach prog : i915_progs
 	test_list += prog
 endforeach
 
+foreach prog : msm_progs
+	test_executables += executable(prog, join_paths('msm', prog + '.c'),
+				       dependencies : test_deps,
+				       install_dir : libexecdir,
+				       install_rpath : libexecdir_rpathdir,
+				       install : true)
+	test_list += prog
+endforeach
+
 test_executables += executable('drm_fdinfo',
 	   join_paths('i915', 'drm_fdinfo.c'),
 	   dependencies : test_deps + [ lib_igt_drm_fdinfo ],
diff --git a/tests/msm_mapping.c b/tests/msm/msm_mapping.c
similarity index 100%
rename from tests/msm_mapping.c
rename to tests/msm/msm_mapping.c
diff --git a/tests/msm_recovery.c b/tests/msm/msm_recovery.c
similarity index 100%
rename from tests/msm_recovery.c
rename to tests/msm/msm_recovery.c
diff --git a/tests/msm_submit.c b/tests/msm/msm_submit.c
similarity index 100%
rename from tests/msm_submit.c
rename to tests/msm/msm_submit.c
-- 
2.31.0