tests: Prefix pm_ tests with i915_ and move them to i915/

They are i915-specific, so they belong to the directory.
The (now) infix _pm_ is quite informative and worth keeping.

v2: also prefix .c files

Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Ewelina Musial <ewelina.musial@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>

9 files changed, 25 insertions, 13 deletions

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 1efd3ecb..35c79592 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -77,12 +77,6 @@ TESTS_progs = \
 	meta_test \
 	perf \
 	perf_pmu \
-	pm_backlight \
-	pm_lpsp \
-	pm_rc6_residency \
-	pm_rpm \
-	pm_rps \
-	pm_sseu \
 	prime_busy \
 	prime_mmap \
 	prime_mmap_coherency \
@@ -486,6 +480,24 @@ i915_missed_irq_SOURCES = i915/i915_missed_irq.c
 TESTS_progs += i915_module_load
 i915_module_load_SOURCES = i915/i915_module_load.c
 
+TESTS_progs += i915_pm_backlight
+i915_pm_backlight_SOURCES = i915/i915_pm_backlight.c
+
+TESTS_progs += i915_pm_lpsp
+i915_pm_lpsp_SOURCES = i915/i915_pm_lpsp.c
+
+TESTS_progs += i915_pm_rc6_residency
+i915_pm_rc6_residency_SOURCES = i915/i915_pm_rc6_residency.c
+
+TESTS_progs += i915_pm_rpm
+i915_pm_rpm_SOURCES = i915/i915_pm_rpm.c
+
+TESTS_progs += i915_pm_rps
+i915_pm_rps_SOURCES = i915/i915_pm_rps.c
+
+TESTS_progs += i915_pm_sseu
+i915_pm_sseu_SOURCES = i915/i915_pm_sseu.c
+
 TESTS_progs += i915_query
 i915_query_SOURCES = i915/i915_query.c
 
diff --git a/tests/pm_backlight.c b/tests/i915/i915_pm_backlight.c
index 054300f6..054300f6 100644
--- a/tests/pm_backlight.c
+++ b/tests/i915/i915_pm_backlight.c
diff --git a/tests/pm_lpsp.c b/tests/i915/i915_pm_lpsp.c
index b319dbe9..b319dbe9 100644
--- a/tests/pm_lpsp.c
+++ b/tests/i915/i915_pm_lpsp.c
diff --git a/tests/pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
index abc30ac6..abc30ac6 100644
--- a/tests/pm_rc6_residency.c
+++ b/tests/i915/i915_pm_rc6_residency.c
diff --git a/tests/pm_rpm.c b/tests/i915/i915_pm_rpm.c
index be296f52..be296f52 100644
--- a/tests/pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
diff --git a/tests/pm_rps.c b/tests/i915/i915_pm_rps.c
index d20cd2d8..d20cd2d8 100644
--- a/tests/pm_rps.c
+++ b/tests/i915/i915_pm_rps.c
diff --git a/tests/pm_sseu.c b/tests/i915/i915_pm_sseu.c
index 252df7d3..252df7d3 100644
--- a/tests/pm_sseu.c
+++ b/tests/i915/i915_pm_sseu.c
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index f9ad47ea..f3440f31 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -13,7 +13,7 @@ igt@drm_mm(@.*)?
 # failures in tests run afterwards.
 ###############################################
 igt@i915_module_load(@.*)?
-igt@pm_rpm@module-reload
+igt@i915_pm_rpm@module-reload
 ###############################################
 # GEM
 ###############################################
diff --git a/tests/meson.build b/tests/meson.build
index bb90711e..f4bd4a10 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -63,12 +63,6 @@ test_progs = [
 	'kms_vrr',
 	'meta_test',
 	'perf',
-	'pm_backlight',
-	'pm_lpsp',
-	'pm_rc6_residency',
-	'pm_rpm',
-	'pm_rps',
-	'pm_sseu',
 	'prime_busy',
 	'prime_mmap',
 	'prime_mmap_coherency',
@@ -223,6 +217,12 @@ i915_progs = [
 	'i915_hangman',
 	'i915_missed_irq',
 	'i915_module_load',
+	'i915_pm_backlight',
+	'i915_pm_lpsp',
+	'i915_pm_rc6_residency',
+	'i915_pm_rpm',
+	'i915_pm_rps',
+	'i915_pm_sseu',
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',