From patchwork Wed Mar 2 14:00:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8480761 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 0A5569F372 for ; Wed, 2 Mar 2016 14:01:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3709E2038A for ; Wed, 2 Mar 2016 14:01:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 10A3C20386 for ; Wed, 2 Mar 2016 14:01:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79B056E87C; Wed, 2 Mar 2016 14:01:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F3056E87C for ; Wed, 2 Mar 2016 14:01:08 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n186so9823062wmn.0 for ; Wed, 02 Mar 2016 06:01:08 -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=6AJtyi7Y0Jj73DZ1guL8jONU0S4YCfMKvnRSIEjJppI=; b=BZKl4zyogvXbeb2Lpp3SDL5D7wKGqB4VjIPd/ZzCGMhiAJLjyEhS/l7tBjhhzmXtYG pmkBxHRPzltOC9vniBB0qyGV2FZ0F9qxrYMtyMkcuYRpwuir9UEK5hRGi280u3RSdBn5 wZ8byzsqzz1VtYZVnDGmkiD0ADLx7sMxR/c1meDMwrTJnkn1BeQyVErD+wU05D63gWWD uvNXQJbAaZjlQrjXFW8fRWtE2rAs9j4EgUIGWvLm2LNtF36ULjcXeauXh5Y+DYA/bbc8 ta6iaAPUkVPDHOnRf4NmpdoeYBbccKUzaiSXjLXeVxLOin1umjKcsQrd7cTySywktnIY 4vtg== 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=6AJtyi7Y0Jj73DZ1guL8jONU0S4YCfMKvnRSIEjJppI=; b=iqFtXcBUHtKosCac3oyfYd+nbGMOf9XaSlUiK8KNPAiiOnT10tRv+O2StmSEYghHWD 6cXM3zLFtsqug8ADbRmH54hyXTJiam+J1dY+mIe+3kUD8mqEZHAaLhvHCowVAoGXbqS3 haGYP4souPlXNGE3wODDGwqsy2HYlHxreH6PBNLtJsZKZnOumPe+wV3KUZZEaW6UAeIm evLvFQ4iUe0LJuu2Xp/ESUjFAwXw4gWx4d3Ay+eQcSSiMiaSTRVTtKZDhcvWOf4sZJ82 OtS7M4c0rxNI7VtdnGi2D/tXZ12bQZ095FhuTxlv0nWocXtaIrVnrjTKTeWLiMwr5cc5 DrkQ== X-Gm-Message-State: AD7BkJJzkD6mJaSPpywuTBzUSNeUNL888plp0BtihR8HDGVPba/tRsD4+eJfm0zmTTer3w== X-Received: by 10.28.182.194 with SMTP id g185mr23739wmf.41.1456927266730; Wed, 02 Mar 2016 06:01:06 -0800 (PST) Received: from cizrna.lan ([109.72.12.223]) by smtp.gmail.com with ESMTPSA id e19sm4359876wmd.1.2016.03.02.06.01.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 06:01:05 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Wed, 2 Mar 2016 15:00:11 +0100 Message-Id: <1456927221-32421-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456927221-32421-1-git-send-email-tomeu.vizoso@collabora.com> References: <1456927221-32421-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 v1 04/14] 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 --- 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");