From patchwork Thu Jan 10 09:19:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10755413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB99791E for ; Thu, 10 Jan 2019 09:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCFA82909B for ; Thu, 10 Jan 2019 09:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1239290A4; Thu, 10 Jan 2019 09:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 160222909B for ; Thu, 10 Jan 2019 09:19:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C3846E660; Thu, 10 Jan 2019 09:19:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id F3C826E646; Thu, 10 Jan 2019 09:19:19 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 15175275-1500050 for multiple; Thu, 10 Jan 2019 09:19:14 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Jan 2019 09:19:12 +0000 Message-Id: <20190110091912.10893-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/hangman: Skip if disabled by the kernel X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Some kernels may have to disable error capture for some hardware or by it being configured out. Since it is conditionally available, asserting it exists is not an actual requirement. For hardware where we are unable to provide error state capture, skip. Signed-off-by: Chris Wilson Acked-by: Antonio Argenziano --- tests/i915/hangman.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/i915/hangman.c b/tests/i915/hangman.c index 6ddae4912..4035f7384 100644 --- a/tests/i915/hangman.c +++ b/tests/i915/hangman.c @@ -42,13 +42,16 @@ static int device = -1; static int sysfs = -1; -static void test_sysfs_error_exists(void) +static bool has_error_state(int dir) { - char *error; + int fd; - error = igt_sysfs_get(sysfs, "error"); - igt_assert(error); - free(error); + fd = openat(dir, "error", O_RDONLY); + if (fd < 0) + return false; + + close(fd); + return true; } static void assert_entry(const char *s, bool expect) @@ -256,12 +259,12 @@ igt_main device = drm_open_driver(DRIVER_INTEL); igt_require_gem(device); + sysfs = igt_sysfs_open(device, &idx); igt_assert(sysfs != -1); - } - igt_subtest("error-state-sysfs-entry") - test_sysfs_error_exists(); + igt_require(has_error_state(sysfs)); + } igt_subtest("error-state-basic") test_error_state_basic();