From patchwork Tue Feb 11 23:07:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3633271 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1AA759F358 for ; Tue, 11 Feb 2014 23:07:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 324E120136 for ; Tue, 11 Feb 2014 23:07:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6AD53201F2 for ; Tue, 11 Feb 2014 23:07:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE65EFABAE; Tue, 11 Feb 2014 15:07:42 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 15316FABA8 for ; Tue, 11 Feb 2014 15:07:40 -0800 (PST) Received: by mail-ea0-f170.google.com with SMTP id g15so2264546eak.29 for ; Tue, 11 Feb 2014 15:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zVeYqalImtcjG7OFq5KS/hPsydBADveK+pxPemLeIsA=; b=AAwU8aV1XlWF8ptZ22Xf40AuSrYIT70DhRW+uEbBw/Ao98HA3dqLI4hRvEIJQ2OH+c xpvOXTGsgG8BU6cWVjdeygJqxidM8jvDv9bR1+scc3bOhH/4xIP3pxdWv0UImvXycszO LCnHWwEpcwd4YXzyJsL11p+ye2HKnAsFsZ+Mg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zVeYqalImtcjG7OFq5KS/hPsydBADveK+pxPemLeIsA=; b=RBZ1ivEDkUfdX+1d1Hfhu3ftd25oiDdsvnLzOyyWreJ6vMJTQDaNTR4DKf+gVH/y8Y kVfRdZXNym78HeP0wvpNwlbjOsXqLagNEBnNGJVBVW6iKLPPkcUSa5kzHeQSlFG8HomO VwCs/ZcrnOt3r5OxBxkZOAgKKriI+Rdl9dun3eMITwNBjLOd4mVAfenbBcixJG7QozAO 8kus1yWNU8KBCuULhh48r/E3i6yVXblsapeBSeu4X5ZzkPyoonAz8yFUjz5UksN2Fqlq 3QLhgQp2qPx0VcQOGwbCDmn0RKRAvTGnetZaC/TBIa9UAZOrXIkBhUP6Na8Tvx8aUqHX gcFg== X-Gm-Message-State: ALoCoQnbfbVBnktzuqY2pRiYX5wE8PmS9XyhCgntJvwVxaTbi+F2ER5F5Uvhj30Ll/PMWojxJeuu X-Received: by 10.14.198.132 with SMTP id v4mr46776548een.43.1392160059813; Tue, 11 Feb 2014 15:07:39 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id u6sm72875720eep.11.2014.02.11.15.07.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Feb 2014 15:07:39 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 12 Feb 2014 00:07:26 +0100 Message-Id: <1392160051-10998-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392160051-10998-1-git-send-email-daniel.vetter@ffwll.ch> References: <1392160051-10998-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/7] tests/gem_close_race: Properly wrap init code in fixtures X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Blows up otherwise if there's no intel gpu around. Signed-off-by: Daniel Vetter --- tests/gem_close_race.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/gem_close_race.c b/tests/gem_close_race.c index 4485db21180b..2087fed6080d 100644 --- a/tests/gem_close_race.c +++ b/tests/gem_close_race.c @@ -223,9 +223,12 @@ igt_main { igt_skip_on_simulation(); - sprintf(device, "/dev/dri/card%d", drm_get_card()); - { - int fd = open(device, O_RDWR); + igt_fixture { + int fd; + + sprintf(device, "/dev/dri/card%d", drm_get_card()); + fd = open(device, O_RDWR); + igt_assert(fd != -1); devid = intel_get_drm_devid(fd); has_64bit_relocations = intel_gen(devid) >= 8;