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=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5B5F4C04FF3 for ; Mon, 24 May 2021 14:01:34 +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 EC5AD60233 for ; Mon, 24 May 2021 14:01:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC5AD60233 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 484AB6E82F; Mon, 24 May 2021 14:01:33 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C26116E821; Mon, 24 May 2021 14:01:27 +0000 (UTC) IronPort-SDR: /xe3XQ75kZZW9f258GF3yHxn8DBZjjtlr/w9TMTtc3MDgQSQrg2ZKrRVLMM3O6BrRwedWejct0 ibbeTJiVmG8w== X-IronPort-AV: E=McAfee;i="6200,9189,9993"; a="265838094" X-IronPort-AV: E=Sophos;i="5.82,325,1613462400"; d="scan'208";a="265838094" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 07:01:26 -0700 IronPort-SDR: KIAIOhf6xMKkBTKhoeeSZnmX3vGQXXXgcfHlZ7tr5ajzrWcY4sY75ToT8QYRyv0e0//eUJ1cK4 NBxquWWv9mMg== X-IronPort-AV: E=Sophos;i="5.82,325,1613462400"; d="scan'208";a="396388918" Received: from gtenuto-mobl1.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.210.116]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 07:01:21 -0700 From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Mon, 24 May 2021 15:01:13 +0100 Message-Id: <20210524140113.1782804-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] 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: 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" 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. 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..89992a3c5099 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!"); + 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; i915 = gem_reopen_driver(i915); /* Apply modparam. */ -- 2.30.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx