From patchwork Wed Jul 4 14:43:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10507089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4FD060325 for ; Wed, 4 Jul 2018 14:43:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94FC228DA2 for ; Wed, 4 Jul 2018 14:43:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8929528DF1; Wed, 4 Jul 2018 14:43:48 +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 3A93028DA2 for ; Wed, 4 Jul 2018 14:43:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A8256EB68; Wed, 4 Jul 2018 14:43:47 +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 C53586EB68; Wed, 4 Jul 2018 14:43:45 +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 12251286-1500050 for multiple; Wed, 04 Jul 2018 15:43:37 +0100 From: Chris Wilson To: igt-dev@lists.freedesktop.org Date: Wed, 4 Jul 2018 15:43:38 +0100 Message-Id: <20180704144338.18937-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.18.0 Subject: [Intel-gfx] [PATCH i-g-t] igt/kms_draw_crc: Test for a working GPU first 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: intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The draw-method-blt subtests require a working GPU, so create a subtest group for the draw-methods, and skip the BLT group using igt_require_gem() in its fixture. Signed-off-by: Chris Wilson --- tests/kms_draw_crc.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/kms_draw_crc.c b/tests/kms_draw_crc.c index 86dcf3928..4bf2f1ed4 100644 --- a/tests/kms_draw_crc.c +++ b/tests/kms_draw_crc.c @@ -323,14 +323,24 @@ igt_main for (format_idx = 0; format_idx < N_FORMATS; format_idx++) { for (method = 0; method < IGT_DRAW_METHOD_COUNT; method++) { - for (tiling_idx = 0; tiling_idx < N_TILING_METHODS; tiling_idx++) { - igt_subtest_f("draw-method-%s-%s-%s", - format_str(format_idx), - igt_draw_get_method_name(method), - tiling_str(tiling_idx)) - draw_method_subtest(method, format_idx, - tilings[tiling_idx]); - } } } + igt_subtest_group { + igt_fixture { + if (method == IGT_DRAW_BLT) + igt_require_gem(drm_fd); + } + + for (tiling_idx = 0; + tiling_idx < N_TILING_METHODS; + tiling_idx++) { + igt_subtest_f("draw-method-%s-%s-%s", + format_str(format_idx), + igt_draw_get_method_name(method), + tiling_str(tiling_idx)) + draw_method_subtest(method, + format_idx, + tilings[tiling_idx]); + } + }}} igt_subtest("fill-fb") fill_fb_subtest();