[igt-dev] [PATCH v4] core_getversion: Test for desired device

[Helen Koike]

On 29/09/2023 06:34, Kamil Konieczny wrote:
> Hi Rob,
> 
> On 2023-09-28 at 14:05:27 -0700, Rob Clark wrote:
>> From: Rob Clark <robdclark at chromium.org>
>>
>> We discovered in drm/ci that if the drm device fails to probe, all the
>> tests come back as "Skip" and the job is considered successful. Fix
>> the getversion test to fail if there is no drm device or if the drm
>> device does not match the expected device as specified by the optional
>> IGT_REQUIRED_DRIVER environment variable.
> ----- ^^^^^^^^
> FORCE
> 
>>
>> Signed-off-by: Rob Clark <robdclark at chromium.org>
>> Acked-by: Helen Koike <helen.koike at collabora.com>
>> Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
>> ---
>> I dropped the previous two lib/drmtest patches, as they are no longer
>> strictly required.  I think they are still nice-to-have, but they are
>> unchanged since the previous version so it didn't seem useful to re-
>> send them.
>>
>>   tests/core_getversion.c | 9 ++++++++-
>>   1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/core_getversion.c b/tests/core_getversion.c
>> index 32cb976e4923..8c8e0c9a3e5e 100644
>> --- a/tests/core_getversion.c
>> +++ b/tests/core_getversion.c
>> @@ -48,14 +48,21 @@ igt_simple_main
>>   {
>>   	int fd;
>>   	drmVersionPtr v;
>> +	const char *name = getenv("IGT_FORCE_DRIVER");
>>   
>> -	fd = drm_open_driver(DRIVER_ANY);
>> +	fd = __drm_open_driver(DRIVER_ANY);
> 
> Did you tested it?

I did! :)

With drm-ci:

https://gitlab.freedesktop.org/helen.fo
rnazier/linux/-/pipelines/997824

I could see that msm jobs failed here, but the others didn't.
(the jobs from the others are red because of other failures from my 
tests, but core_getversion passed).

Tested-by: Helen Koike <helen.koike at collabora.com>

> 
>> +	igt_assert_fd(fd);
> 
> imho better igt_assert_f(fd > 0, "Error opening driver, forced: %s\n", name ? name : "(not-used)");
> 
> Regards,
> Kamil
> 
>>   	v = drmGetVersion(fd);
>>   	igt_assert_neq(strlen(v->name), 0);
>>   	igt_assert_neq(strlen(v->date), 0);
>>   	igt_assert_neq(strlen(v->desc), 0);
>>   	if (is_i915_device(fd))
>>   		igt_assert_lte(1, v->version_major);
>> +	if (name) {
>> +		igt_assert_f(!strcmp(name, v->name),
>> +			     "Expected driver \"%s\" but got \"%s\"\n",
>> +			     name, v->name);
>> +	}
>>   
>>   	drmFree(v);
>>   	drm_close_driver(fd);
>> -- 
>> 2.41.0
>>