[igt-dev] [PATCH i-g-t] tests: Prefix pm_ tests with i915_ and move them to i915/

Arkadiusz Hiler arkadiusz.hiler at intel.com
Mon Feb 18 14:26:21 UTC 2019


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

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

Acks/rbs appreciated, but please let me push it, as I have to do
renaming in the cibuglog first :-)

 tests/Makefile.sources              | 24 ++++++++++++++++++------
 tests/{ => i915}/pm_backlight.c     |  0
 tests/{ => i915}/pm_lpsp.c          |  0
 tests/{ => i915}/pm_rc6_residency.c |  0
 tests/{ => i915}/pm_rpm.c           |  0
 tests/{ => i915}/pm_rps.c           |  0
 tests/{ => i915}/pm_sseu.c          |  0
 tests/meson.build                   | 13 +++++++------
 8 files changed, 25 insertions(+), 12 deletions(-)
 rename tests/{ => i915}/pm_backlight.c (100%)
 rename tests/{ => i915}/pm_lpsp.c (100%)
 rename tests/{ => i915}/pm_rc6_residency.c (100%)
 rename tests/{ => i915}/pm_rpm.c (100%)
 rename tests/{ => i915}/pm_rps.c (100%)
 rename tests/{ => i915}/pm_sseu.c (100%)

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index d2c4f9fe..f130b116 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/missed_irq.c
 TESTS_progs += i915_module_load
 i915_module_load_SOURCES = i915/module_load.c
 
+TESTS_progs += i915_pm_backlight
+i915_pm_backlight_SOURCES = i915/pm_backlight.c
+
+TESTS_progs += i915_pm_lpsp
+i915_pm_lpsp_SOURCES = i915/pm_lpsp.c
+
+TESTS_progs += i915_pm_rc6_residency
+i915_pm_rc6_residency_SOURCES = i915/pm_rc6_residency.c
+
+TESTS_progs += i915_pm_rpm
+i915_pm_rpm_SOURCES = i915/pm_rpm.c
+
+TESTS_progs += i915_pm_rps
+i915_pm_rps_SOURCES = i915/pm_rps.c
+
+TESTS_progs += i915_pm_sseu
+i915_pm_sseu_SOURCES = i915/pm_sseu.c
+
 TESTS_progs += i915_query
 i915_query_SOURCES = i915/query.c
 
diff --git a/tests/pm_backlight.c b/tests/i915/pm_backlight.c
similarity index 100%
rename from tests/pm_backlight.c
rename to tests/i915/pm_backlight.c
diff --git a/tests/pm_lpsp.c b/tests/i915/pm_lpsp.c
similarity index 100%
rename from tests/pm_lpsp.c
rename to tests/i915/pm_lpsp.c
diff --git a/tests/pm_rc6_residency.c b/tests/i915/pm_rc6_residency.c
similarity index 100%
rename from tests/pm_rc6_residency.c
rename to tests/i915/pm_rc6_residency.c
diff --git a/tests/pm_rpm.c b/tests/i915/pm_rpm.c
similarity index 100%
rename from tests/pm_rpm.c
rename to tests/i915/pm_rpm.c
diff --git a/tests/pm_rps.c b/tests/i915/pm_rps.c
similarity index 100%
rename from tests/pm_rps.c
rename to tests/i915/pm_rps.c
diff --git a/tests/pm_sseu.c b/tests/i915/pm_sseu.c
similarity index 100%
rename from tests/pm_sseu.c
rename to tests/i915/pm_sseu.c
diff --git a/tests/meson.build b/tests/meson.build
index ec980651..3e3dd347 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',
@@ -96,12 +90,19 @@ test_progs = [
 	'vgem_slow',
 ]
 
+# will get prefixed with i915_
 i915_progs = [
 	'fb_tiling',
 	'getparams_basic',
 	'hangman',
 	'missed_irq',
 	'module_load',
+	'pm_backlight',
+	'pm_lpsp',
+	'pm_rc6_residency',
+	'pm_rpm',
+	'pm_rps',
+	'pm_sseu',
 	'query',
 	'selftest',
 	'suspend',
-- 
2.20.1



More information about the igt-dev mailing list