10 files changed, 21 insertions, 38 deletions
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index d2c4f9fe..1efd3ecb 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -472,28 +472,28 @@ TESTS_progs += gen3_render_tiledy_blits
 gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
 
 TESTS_progs += i915_fb_tiling
-i915_fb_tiling_SOURCES = i915/fb_tiling.c
+i915_fb_tiling_SOURCES = i915/i915_fb_tiling.c
 
 TESTS_progs += i915_getparams_basic
-i915_getparams_basic_SOURCES = i915/getparams_basic.c
+i915_getparams_basic_SOURCES = i915/i915_getparams_basic.c
 
 TESTS_progs += i915_hangman
-i915_hangman_SOURCES = i915/hangman.c
+i915_hangman_SOURCES = i915/i915_hangman.c
 
 TESTS_progs += i915_missed_irq
-i915_missed_irq_SOURCES = i915/missed_irq.c
+i915_missed_irq_SOURCES = i915/i915_missed_irq.c
 
 TESTS_progs += i915_module_load
-i915_module_load_SOURCES = i915/module_load.c
+i915_module_load_SOURCES = i915/i915_module_load.c
 
 TESTS_progs += i915_query
-i915_query_SOURCES = i915/query.c
+i915_query_SOURCES = i915/i915_query.c
 
 TESTS_progs += i915_selftest
-i915_selftest_SOURCES = i915/selftest.c
+i915_selftest_SOURCES = i915/i915_selftest.c
 
 TESTS_progs += i915_suspend
-i915_suspend_SOURCES = i915/suspend.c
+i915_suspend_SOURCES = i915/i915_suspend.c
 
 TESTS_progs_X = gem_concurrent_all
 gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
diff --git a/tests/i915/fb_tiling.c b/tests/i915/i915_fb_tiling.c
index 7d5c3f1f..7d5c3f1f 100644
--- a/tests/i915/fb_tiling.c
+++ b/tests/i915/i915_fb_tiling.c
diff --git a/tests/i915/getparams_basic.c b/tests/i915/i915_getparams_basic.c
index 7cb210df..7cb210df 100644
--- a/tests/i915/getparams_basic.c
+++ b/tests/i915/i915_getparams_basic.c
diff --git a/tests/i915/hangman.c b/tests/i915/i915_hangman.c
index df1e0afe..df1e0afe 100644
--- a/tests/i915/hangman.c
+++ b/tests/i915/i915_hangman.c
diff --git a/tests/i915/missed_irq.c b/tests/i915/i915_missed_irq.c
index 302da0e8..302da0e8 100644
--- a/tests/i915/missed_irq.c
+++ b/tests/i915/i915_missed_irq.c
diff --git a/tests/i915/module_load.c b/tests/i915/i915_module_load.c
index 7fe83520..7fe83520 100644
--- a/tests/i915/module_load.c
+++ b/tests/i915/i915_module_load.c
diff --git a/tests/i915/query.c b/tests/i915/i915_query.c
index 7d0c0e3a..7d0c0e3a 100644
--- a/tests/i915/query.c
+++ b/tests/i915/i915_query.c
diff --git a/tests/i915/selftest.c b/tests/i915/i915_selftest.c
index 6d597e68..6d597e68 100644
--- a/tests/i915/selftest.c
+++ b/tests/i915/i915_selftest.c
diff --git a/tests/i915/suspend.c b/tests/i915/i915_suspend.c
index 84cb3b49..84cb3b49 100644
--- a/tests/i915/suspend.c
+++ b/tests/i915/i915_suspend.c
diff --git a/tests/meson.build b/tests/meson.build
index ec980651..bb90711e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -97,17 +97,11 @@ test_progs = [
 ]
 
 i915_progs = [
-	'fb_tiling',
-	'getparams_basic',
-	'hangman',
-	'missed_irq',
-	'module_load',
-	'query',
-	'selftest',
-	'suspend',
-]
-
-gem_progs = [
+	'gen3_mixed_blits',
+	'gen3_render_linear_blits',
+	'gen3_render_mixed_blits',
+	'gen3_render_tiledx_blits',
+	'gen3_render_tiledy_blits',
 	'gem_bad_reloc',
 	'gem_basic',
 	'gem_busy',
@@ -224,14 +218,14 @@ gem_progs = [
 	'gem_wait',
 	'gem_workarounds',
 	'gem_write_read_ring_switch',
-]
-
-gen3_progs = [
-	'gen3_mixed_blits',
-	'gen3_render_linear_blits',
-	'gen3_render_mixed_blits',
-	'gen3_render_tiledx_blits',
-	'gen3_render_tiledy_blits',
+	'i915_fb_tiling',
+	'i915_getparams_basic',
+	'i915_hangman',
+	'i915_missed_irq',
+	'i915_module_load',
+	'i915_query',
+	'i915_selftest',
+	'i915_suspend',
 ]
 
 test_deps = [ igt_deps ]
@@ -272,17 +266,6 @@ foreach prog : test_progs
 endforeach
 
 foreach prog : i915_progs
-	prog_name = 'i915_' + prog
-	test_executables += executable(prog_name,
-		   join_paths('i915', prog + '.c'),
-		   dependencies : test_deps,
-		   install_dir : libexecdir,
-		   install_rpath : libexecdir_rpathdir,
-		   install : true)
-	test_list += prog_name
-endforeach
-
-foreach prog : gem_progs + gen3_progs
 	test_executables += executable(prog,
 		   join_paths('i915', prog + '.c'),
 		   dependencies : test_deps,