From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55C0310E2F7 for ; Thu, 2 Feb 2023 17:27:58 +0000 (UTC) From: Nirmoy Das To: igt-dev@lists.freedesktop.org Date: Thu, 2 Feb 2023 18:27:44 +0100 Message-Id: <20230202172744.22955-1-nirmoy.das@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v2] i915/gem_exec_params: Cross-check getparam against engine execution List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Wilson , Nirmoy Das Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Chris Wilson Do not just skip the test if getparam for bsd, blt, vebox passes. Be more robust and compare result of getparam with a engine execution which should give more test coverage. v2: improve commit message and keep RUN_FAIL()(Kamil) Cc: Daniele Ceraolo Spurio Cc: Kamil Konieczny Signed-off-by: Chris Wilson Co-developed-by: Nirmoy Das Signed-off-by: Nirmoy Das --- tests/i915/gem_exec_params.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c index 618635ec3..fd86afa16 100644 --- a/tests/i915/gem_exec_params.c +++ b/tests/i915/gem_exec_params.c @@ -411,24 +411,23 @@ igt_main igt_subtest("mmapped") mmapped(fd); -#define RUN_FAIL(expected_errno) do { \ - igt_assert_eq(__gem_execbuf(fd, &execbuf), -expected_errno); \ - } while(0) +#define CHK_RUN(has_check, expected_errno) \ + igt_assert_eq(__gem_execbuf(fd, &execbuf), has_check(fd) ? 0 : -(expected_errno)) +#define RUN_FAIL(expected_errno) \ + igt_assert_eq(__gem_execbuf(fd, &execbuf), -(expected_errno)) + igt_subtest("no-bsd") { - igt_require(!gem_has_bsd(fd)); execbuf.flags = I915_EXEC_BSD; - RUN_FAIL(EINVAL); + CHK_RUN(gem_has_bsd, EINVAL); } igt_subtest("no-blt") { - igt_require(!gem_has_blt(fd)); execbuf.flags = I915_EXEC_BLT; - RUN_FAIL(EINVAL); + CHK_RUN(gem_has_blt, EINVAL); } igt_subtest("no-vebox") { - igt_require(!gem_has_vebox(fd)); execbuf.flags = I915_EXEC_VEBOX; - RUN_FAIL(EINVAL); + CHK_RUN(gem_has_vebox, EINVAL); } igt_subtest("invalid-ring") { execbuf.flags = I915_EXEC_RING_MASK; -- 2.39.0