From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 364BFC11F67 for ; Tue, 29 Jun 2021 22:02:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B7EA061D72 for ; Tue, 29 Jun 2021 22:02:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7EA061D72 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62A756E03B; Tue, 29 Jun 2021 22:02:23 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BC4F89CA2; Tue, 29 Jun 2021 22:02:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10030"; a="205240004" X-IronPort-AV: E=Sophos;i="5.83,310,1616482800"; d="scan'208";a="205240004" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 15:01:30 -0700 X-IronPort-AV: E=Sophos;i="5.83,310,1616482800"; d="scan'208";a="456966449" Received: from adixit-mobl1.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.212.242.3]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 15:01:30 -0700 Date: Tue, 29 Jun 2021 15:00:30 -0700 Message-ID: <87o8bobabl.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Tvrtko Ursulin In-Reply-To: <20210524143801.1787579-1-tvrtko.ursulin@linux.intel.com> References: <20210524143801.1787579-1-tvrtko.ursulin@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Subject: Re: [Intel-gfx] [PATCH i-g-t v2] gem_watchdog: Skip test if default request expiry is not compiled in X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 24 May 2021 07:38:01 -0700, Tvrtko Ursulin wrote: > > From: Tvrtko Ursulin > > Test incorrectly assumes no modparam means default expiry, while in > reality no modparam means old kernel / de-selected feature in which > case test should skip. > > v2: > * New line. (Petri) Reviewed-by: Ashutosh Dixit > Signed-off-by: Tvrtko Ursulin > --- > tests/i915/gem_watchdog.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c > index 8f9fb17750fb..67fddac74bc1 100644 > --- a/tests/i915/gem_watchdog.c > +++ b/tests/i915/gem_watchdog.c > @@ -630,6 +630,7 @@ igt_main > > igt_fixture { > struct drm_i915_query_item item; > + const unsigned int timeout = 1; > char *tmp; > > i915 = drm_open_driver_master(DRIVER_INTEL); > @@ -639,16 +640,13 @@ igt_main > igt_require_gem(i915); > > tmp = __igt_params_get(i915, "request_timeout_ms"); > - if (tmp) { > - const unsigned int timeout = 1; > + igt_skip_on_f(!tmp || !atoi(tmp), > + "Request expiry not supported!\n"); > + free(tmp); > > - igt_params_save_and_set(i915, "request_timeout_ms", > - "%u", timeout * 1000); > - default_timeout_wait_s = timeout * 5; > - free(tmp); > - } else { > - default_timeout_wait_s = 12; > - } > + igt_params_save_and_set(i915, "request_timeout_ms", "%u", > + timeout * 1000); > + default_timeout_wait_s = timeout * 5; _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx