From patchwork Mon Feb 6 10:16:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9557457 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 5EC3A6021C for ; Mon, 6 Feb 2017 10:16:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 542A827C05 for ; Mon, 6 Feb 2017 10:16:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45C3527F7F; Mon, 6 Feb 2017 10:16:31 +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=-4.2 required=2.0 tests=BAYES_00, 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 E2A8227C05 for ; Mon, 6 Feb 2017 10:16:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F42056E39F; Mon, 6 Feb 2017 10:16:28 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from johanna2.inet.fi (mta-out1.inet.fi [62.71.2.203]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D7C96E39F for ; Mon, 6 Feb 2017 10:16:27 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 80 2014-11-10_18-01-23 260f8afb9361da3c7edfd3a8e3a4ca908191ad29 RazorGate-KAS: Lua profiles 69136 [Nov 12 2014] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.250.112.128) by johanna2.inet.fi (9.0.002.03-2-gbe5d057) id 5892DDAB00AE4789; Mon, 6 Feb 2017 12:16:26 +0200 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1cagLS-00009s-6K; Mon, 06 Feb 2017 12:16:26 +0200 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Mon, 6 Feb 2017 12:16:01 +0200 Message-Id: <1486376161-550-1-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [Intel-gfx] [PATCH i-g-t] tests/gem_exec_reloc: Call igt_(dis)allow_hang inside subtest block X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP gem_exec_reloc --list-subtests breaks otherwise. CC: Chris Wilson Signed-off-by: Petri Latvala --- tests/gem_exec_reloc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/gem_exec_reloc.c b/tests/gem_exec_reloc.c index 78bb59c..012abc2 100644 --- a/tests/gem_exec_reloc.c +++ b/tests/gem_exec_reloc.c @@ -550,19 +550,20 @@ igt_main for (f = flags; f->name; f++) { igt_hang_t hang; - if (f->flags & HANG) - hang = igt_allow_hang(fd, 0, 0); - for (m = modes; m->name; m++) { igt_subtest_f("%s%s%s", f->basic ? "basic-" : "", m->name, - f->name) + f->name) { + if (f->flags & HANG) + hang = igt_allow_hang(fd, 0, 0); + basic_reloc(fd, m->before, m->after, f->flags); - } - if (f->flags & HANG) - igt_disallow_hang(fd, hang); + if (f->flags & HANG) + igt_disallow_hang(fd, hang); + } + } } igt_subtest("basic-softpin")