From patchwork Tue Mar 8 14:51:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8534941 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8BDD49F8A8 for ; Tue, 8 Mar 2016 14:52:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7605200DF for ; Tue, 8 Mar 2016 14:52:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA45F200D4 for ; Tue, 8 Mar 2016 14:52:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D0D76E6FB; Tue, 8 Mar 2016 14:52:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18C0F6E6EE for ; Tue, 8 Mar 2016 14:52:14 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id 1so4545491wmg.2 for ; Tue, 08 Mar 2016 06:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xnub+zYUWXqYO12ROjC/Eq5nbnJyWDYMdAEpeJioRxg=; b=R8NFmCGrnsMYk9PMl3QGJqOQddaCgEDHO28DVOGgUj3AhL0C6EggG7FkV086j9Txpw wBGIAUxhgb5S11lvAkStYUXhB0qsXIc0a+UMYSXlvyrprGq2Ww/Kc0olH39ptXksySDp Ca/vs2WFR9HT59KhpHsLR0boHxQuryG/k/ftvccBlFOgqT2OLS4PmXJ1eaHW9vKCwG9k UbU7Yo/8OStZGbAUSnmbs/gDp9A6KPoF9Al9jzda/jCCQZQW4lnoyNqTdeLsPX+lSyHD ZLjci+s3xjGVm5qqAVP2gPBpHKuQdIHLbW1gTIdwfPAuKffhVjzvqSPbMTxU49LGXHTq Zcig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Xnub+zYUWXqYO12ROjC/Eq5nbnJyWDYMdAEpeJioRxg=; b=bwCNqGngHWPpFbGQa9eWzNuwP/17cyIQsrvZNk+NhIGWxhpjMCcndqiEpP5kPOy2An DIcRNpyuZJUuneZNKC94n8Nwdokts1lnG0WXso4YphLK6F1BXXt9Hd2ehAhvm9PmVXHR 2qFubgEkGM/WZwClnypA61dV2Fic3WHQf+Vl5jT0ffn5S5gOo1B4Bdda4sM1m5AdpqG0 A10OGHc3fZ43p4tdIKgBqo93fUmJOTuSk+bRlBtUPeaxfAxbAKlud/3it5L2385ITayP VWB3njsxID/WDfN4y22mc0OX2oONk/O5hLjgqGaf8sBHhSkPpmqeWXYMFYLyNkX5fCtq wqiQ== X-Gm-Message-State: AD7BkJLy7qyOKmLFmvrx8JUJfCMize5RzpfwSwjIpM9ulhk99W/36eME0+tDrxbxyDaC/Q== X-Received: by 10.28.5.77 with SMTP id 74mr21162406wmf.62.1457448732345; Tue, 08 Mar 2016 06:52:12 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.52.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:52:11 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:27 +0100 Message-Id: <1457448699-9778-6-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v2 05/17] lib: Have intel_get_drm_devid call igt_require_intel 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 I915_PARAM_CHIPSET_ID is a i915-only thing, so if a subtest ends up calling it when testing another driver, let's skip it. Signed-off-by: Tomeu Vizoso --- Changes in v2: None lib/intel_chipset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c index 0e5b016cdb3d..9056cbf57811 100644 --- a/lib/intel_chipset.c +++ b/lib/intel_chipset.c @@ -38,6 +38,7 @@ #include #include "i915_drm.h" +#include "drmtest.h" #include "intel_chipset.h" #include "igt_core.h" @@ -129,6 +130,7 @@ intel_get_drm_devid(int fd) { const char *override; + igt_require_intel(fd); igt_assert(__drm_device_id); override = getenv("INTEL_DEVID_OVERRIDE");