Re: [igt-dev] [PATCH i-g-t 8/8] kms_fence_pin_leak: Move beneath i915/

Arkadiusz Hiler
2019-02-18T13:37:07Z

On Sun, Feb 17, 2019 at 02:35:56PM +0000, Chris Wilson wrote:
> kms_fence_pin_leak tests smooth sharp edges that are i915 specific (and
> requires using GEM to do so). It doesn't belong in the general paddock
> of all driver tests, so move it into the i915/ stable.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Acked-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tests/Makefile.sources | 5 ++++-
> tests/{ => i915}/kms_fence_pin_leak.c | 0
> tests/meson.build | 2 +-
> 3 files changed, 5 insertions(+), 2 deletions(-)
> rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index d2c4f9fe9..9972b2dd1 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -40,7 +40,6 @@ TESTS_progs = \
> kms_dp_dsc \
> kms_draw_crc \
> kms_fbcon_fbt \
> - kms_fence_pin_leak \
> kms_flip \
> kms_flip_event_leak \
> kms_flip_tiling \
> @@ -99,6 +98,10 @@ TESTS_progs = \
> vgem_slow \
> $(NULL)
>
> +TESTS_progs += \
> + i915/kms_fence_pin_leak \
> + $(NULL)

This just moves it around, so we will end up having binary named
'kms_fence_pin_leak' but in $SRC/tests/i915 dir instead.

That still will install as
$PREFIX/libexec/igt-gpu-tools/kms_fence_pin_leak

If you want to prefix it:
TESTS_progs += i915_kms_fence_pin_leak
i915_kms_fence_pin_leak_SOURCES = i915/kms_fence_pin_leak.c

Oterwise:
TESTS_progs += kms_fence_pin_leak
kms_fence_pin_leak_SOURCES = i915/kms_fence_pin_leak.c

> diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> similarity index 100%
> rename from tests/kms_fence_pin_leak.c
> rename to tests/i915/kms_fence_pin_leak.c
> diff --git a/tests/meson.build b/tests/meson.build
> index ec980651a..08e55b9c0 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -27,7 +27,6 @@ test_progs = [
> 'kms_dp_dsc',
> 'kms_draw_crc',
> 'kms_fbcon_fbt',
> - 'kms_fence_pin_leak',
> 'kms_flip',
> 'kms_flip_event_leak',
> 'kms_flip_tiling',
> @@ -100,6 +99,7 @@ i915_progs = [
> 'fb_tiling',
> 'getparams_basic',
> 'hangman',
> + 'kms_fence_pin_leak',
> 'missed_irq',
> 'module_load',
> 'query',

Here, with meson, it will get prefixed with i915_. I'll add a comment on
top of i915_progs just to be more explicit.

Do we have any conclusion on prefixing Intel-specific kms tests
yet?

--
Cheers,
Arek