[i-g-t V2 2/3] tests/msm: Move MSM tests to new dir

[Bhanuprakash Modem]

Move all MSM specific tests (tests/msm_*) to new dir
(tests/msm/msm_*).

Cc: Rob Clark <robdclark at chromium.org>
Cc: Helen Koike <helen.koike at collabora.com>
Cc: Emma Anholt <emma at anholt.net>
Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Acked-by:  Rob Clark <robdclark at chromium.org>
---
 meson.build           |  8 ++++++++
 tests/meson.build     | 19 ++-----------------
 tests/msm/meson.build | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 tests/msm/meson.build

diff --git a/meson.build b/meson.build
index 701a5cc35..6ae3c2684 100644
--- a/meson.build
+++ b/meson.build
@@ -276,6 +276,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')
 panfrostdir = join_paths(libexecdir, 'panfrost')
 v3ddir = join_paths(libexecdir, 'v3d')
 vc4dir = join_paths(libexecdir, 'vc4')
@@ -316,6 +317,12 @@ if get_option('use_rpath')
 	endforeach
 	amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, libdir)
 
+	msm_rpathdir = '$ORIGIN'
+	foreach p : msmdir.split('/')
+		msm_rpathdir = join_paths(msm_rpathdir, '..')
+	endforeach
+	msm_rpathdir = join_paths(msm_rpathdir, libdir)
+
 	panfrost_rpathdir = '$ORIGIN'
 	foreach p : panfrostdir.split('/')
 		panfrost_rpathdir = join_paths(panfrost_rpathdir, '..')
@@ -343,6 +350,7 @@ else
 	bindir_rpathdir = ''
 	libexecdir_rpathdir = ''
 	amdgpudir_rpathdir = ''
+	msm_rpathdir = ''
 	panfrost_rpathdir = ''
 	v3d_rpathdir = ''
 	vc4_rpathdir = ''
diff --git a/tests/meson.build b/tests/meson.build
index 16896de99..122fbd07c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -314,14 +314,6 @@ intel_xe_progs = [
 	'xe_sysfs_scheduler',
 ]
 
-msm_progs = [
-	'msm_mapping',
-	'msm_recovery',
-	'msm_shrink',
-	'msm_submit',
-	'msm_submitoverhead',
-]
-
 chamelium_progs = [
 	'kms_chamelium_audio',
 	'kms_chamelium_color',
@@ -424,15 +416,6 @@ foreach prog : intel_progs
 	endif
 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
-
 if chamelium.found()
 	foreach prog : chamelium_progs
 		testexe = executable(prog,
@@ -457,6 +440,8 @@ endif
 
 subdir('amdgpu')
 
+subdir('msm')
+
 subdir('panfrost')
 
 subdir('v3d')
diff --git a/tests/msm/meson.build b/tests/msm/meson.build
new file mode 100644
index 000000000..74169b5b2
--- /dev/null
+++ b/tests/msm/meson.build
@@ -0,0 +1,16 @@
+msm_progs = [
+	'msm_mapping',
+	'msm_recovery',
+	'msm_shrink',
+	'msm_submit',
+	'msm_submitoverhead',
+]
+
+foreach prog : msm_progs
+	test_executables += executable(prog, prog + '.c',
+				       dependencies : test_deps,
+				       install_dir : msmdir,
+				       install_rpath : msm_rpathdir,
+				       install : true)
+	test_list += join_paths('msm', prog)
+endforeach
-- 
2.43.2