[i-g-t] i915: Rename gem_exec_parse and gem_exec_parse_blt
diff mbox series

Message ID 20191212102924.1194130-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • [i-g-t] i915: Rename gem_exec_parse and gem_exec_parse_blt
Related show

Commit Message

Chris Wilson Dec. 12, 2019, 10:29 a.m. UTC
The cmdparser tests are tied to the generation, so rename the tests to
indicate that and remove the ambiguity that they are more generic tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 tests/Makefile.sources                                 | 8 ++++----
 tests/i915/{gem_exec_parse.c => gen7_exec_parse.c}     | 0
 tests/i915/{gem_exec_parse_blt.c => gen9_exec_parse.c} | 0
 tests/intel-ci/blacklist.txt                           | 2 +-
 tests/meson.build                                      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/i915/{gem_exec_parse.c => gen7_exec_parse.c} (100%)
 rename tests/i915/{gem_exec_parse_blt.c => gen9_exec_parse.c} (100%)

Comments

Mika Kuoppala Dec. 16, 2019, 10:27 a.m. UTC | #1
Chris Wilson <chris@chris-wilson.co.uk> writes:

> The cmdparser tests are tied to the generation, so rename the tests to
> indicate that and remove the ambiguity that they are more generic tests.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> ---
>  tests/Makefile.sources                                 | 8 ++++----
>  tests/i915/{gem_exec_parse.c => gen7_exec_parse.c}     | 0
>  tests/i915/{gem_exec_parse_blt.c => gen9_exec_parse.c} | 0
>  tests/intel-ci/blacklist.txt                           | 2 +-
>  tests/meson.build                                      | 4 ++--
>  5 files changed, 7 insertions(+), 7 deletions(-)
>  rename tests/i915/{gem_exec_parse.c => gen7_exec_parse.c} (100%)
>  rename tests/i915/{gem_exec_parse_blt.c => gen9_exec_parse.c} (100%)
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 2893f9bc0..806eb02d0 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -241,11 +241,11 @@ gem_exec_parallel_SOURCES = i915/gem_exec_parallel.c
>  TESTS_progs += gem_exec_params
>  gem_exec_params_SOURCES = i915/gem_exec_params.c
>  
> -TESTS_progs += gem_exec_parse
> -gem_exec_parse_SOURCES = i915/gem_exec_parse.c
> +TESTS_progs += gen7_exec_parse
> +gen7_exec_parse_SOURCES = i915/gen7_exec_parse.c
>  
> -TESTS_progs += gem_exec_parse_blt
> -gem_exec_parse_blt_SOURCES = i915/gem_exec_parse_blt.c
> +TESTS_progs += gen9_exec_parse
> +gen9_exec_parse_SOURCES = i915/gen9_exec_parse.c
>  
>  TESTS_progs += gem_exec_reloc
>  gem_exec_reloc_SOURCES = i915/gem_exec_reloc.c
> diff --git a/tests/i915/gem_exec_parse.c b/tests/i915/gen7_exec_parse.c
> similarity index 100%
> rename from tests/i915/gem_exec_parse.c
> rename to tests/i915/gen7_exec_parse.c
> diff --git a/tests/i915/gem_exec_parse_blt.c b/tests/i915/gen9_exec_parse.c
> similarity index 100%
> rename from tests/i915/gem_exec_parse_blt.c
> rename to tests/i915/gen9_exec_parse.c
> diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
> index 4bca1b6c5..a48163c68 100644
> --- a/tests/intel-ci/blacklist.txt
> +++ b/tests/intel-ci/blacklist.txt
> @@ -77,7 +77,7 @@ igt@gem_write_read_ring_switch(@.*)?
>  ###############################################
>  # GEM: Not worth fixing
>  ###############################################
> -igt@gem_exec_parse@.*lri.*
> +igt@gen7_exec_parse@.*lri.*
>  ###############################################
>  # There are no DRRS capable displays in CI lab
>  ###############################################
> diff --git a/tests/meson.build b/tests/meson.build
> index d931cc372..570de5459 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -147,8 +147,8 @@ i915_progs = [
>  	'gem_exec_nop',
>  	'gem_exec_parallel',
>  	'gem_exec_params',
> -	'gem_exec_parse',
> -	'gem_exec_parse_blt',
> +	'gen7_exec_parse',
> +	'gen9_exec_parse',
>  	'gem_exec_reloc',
>  	'gem_exec_reuse',
>  	'gem_exec_schedule',
> -- 
> 2.24.0

Patch
diff mbox series

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 2893f9bc0..806eb02d0 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -241,11 +241,11 @@  gem_exec_parallel_SOURCES = i915/gem_exec_parallel.c
 TESTS_progs += gem_exec_params
 gem_exec_params_SOURCES = i915/gem_exec_params.c
 
-TESTS_progs += gem_exec_parse
-gem_exec_parse_SOURCES = i915/gem_exec_parse.c
+TESTS_progs += gen7_exec_parse
+gen7_exec_parse_SOURCES = i915/gen7_exec_parse.c
 
-TESTS_progs += gem_exec_parse_blt
-gem_exec_parse_blt_SOURCES = i915/gem_exec_parse_blt.c
+TESTS_progs += gen9_exec_parse
+gen9_exec_parse_SOURCES = i915/gen9_exec_parse.c
 
 TESTS_progs += gem_exec_reloc
 gem_exec_reloc_SOURCES = i915/gem_exec_reloc.c
diff --git a/tests/i915/gem_exec_parse.c b/tests/i915/gen7_exec_parse.c
similarity index 100%
rename from tests/i915/gem_exec_parse.c
rename to tests/i915/gen7_exec_parse.c
diff --git a/tests/i915/gem_exec_parse_blt.c b/tests/i915/gen9_exec_parse.c
similarity index 100%
rename from tests/i915/gem_exec_parse_blt.c
rename to tests/i915/gen9_exec_parse.c
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 4bca1b6c5..a48163c68 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -77,7 +77,7 @@  igt@gem_write_read_ring_switch(@.*)?
 ###############################################
 # GEM: Not worth fixing
 ###############################################
-igt@gem_exec_parse@.*lri.*
+igt@gen7_exec_parse@.*lri.*
 ###############################################
 # There are no DRRS capable displays in CI lab
 ###############################################
diff --git a/tests/meson.build b/tests/meson.build
index d931cc372..570de5459 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -147,8 +147,8 @@  i915_progs = [
 	'gem_exec_nop',
 	'gem_exec_parallel',
 	'gem_exec_params',
-	'gem_exec_parse',
-	'gem_exec_parse_blt',
+	'gen7_exec_parse',
+	'gen9_exec_parse',
 	'gem_exec_reloc',
 	'gem_exec_reuse',
 	'gem_exec_schedule',