From patchwork Wed Mar 2 14:00:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8480871 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 7E7CD9F372 for ; Wed, 2 Mar 2016 14:01:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD42720295 for ; Wed, 2 Mar 2016 14:01:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EE6B820396 for ; Wed, 2 Mar 2016 14:01:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E73B76E882; Wed, 2 Mar 2016 14:01:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9ECCF6E883 for ; Wed, 2 Mar 2016 14:01:22 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id p65so9810413wmp.1 for ; Wed, 02 Mar 2016 06:01:22 -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=hwUv1eiYn7u+yc9jPrhQJbK8mmmTf5kzde+Z46lE/ek=; b=ozZ9wKd7n+I0s53j/4ZGQEGqVknRfYE9SVUawrJ2TZKzuGSrm/Kw+dYNDOTgBRnA/T GcP4dHeh1Zm9lJDrKZ4OnuMkN8zj776QgRcfYR8hsreEkNXvvdURErL/uQMLHdLM5sOf ixGOPBsuGyoBVAZqktIj2M/Q0VLgstaMhZX+XPj7IWZ59c4CAXbCkEFzOrDfR3LoGJio sFimvTMh0x6MZ2xT16hwUWqXE3rQQXB3bExOqq5lmE1RTdOoLATI6Vgje41fwfX5WEge 9kIzYP2ruPB0Mm0a+mUi9x+y5OfKK7XYPVYbtNAlkh23ifyzKuNTdtsDgQeCfSE6X5a8 uo+w== 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=hwUv1eiYn7u+yc9jPrhQJbK8mmmTf5kzde+Z46lE/ek=; b=hY1+R43zpgeexpKaO8NqG3tG7gi4hTXyU4UrBEmJByLhqKWNszY+Vy1vzi9RN3uw6E DoagdSPFoUk0nM2Iw4Fodb+40Uj0pFCB5WWYTlERWGZR45Ku0TBVi/7BjZaod3NqkMkg KMFHf3H5A/NSiW789wAF59SVuO0n0F3o7i7kPEq/LmBn3pbDh50o2e7Qi2RlyrjN4INA TvH0uQTjRgg0ZAZaXgVhitrfpS+3z7pSlu0ceLDrbk4r8tpU7W+egx11V0gPrGW5bN57 4ekd23x3hL0vzRfHFah6g7aPhpOqP9B3n9DlxZ14Ivj9l0RIXml8llxCiLKLLqkAEg/s ZXaw== X-Gm-Message-State: AD7BkJLEIvDAQE/niWE73JdVsICPTDcOR++E5lslyDld6ternD43h4amyNX1BrzCVNUVqQ== X-Received: by 10.28.48.137 with SMTP id w131mr19266wmw.73.1456927281071; Wed, 02 Mar 2016 06:01:21 -0800 (PST) Received: from cizrna.lan ([109.72.12.223]) by smtp.gmail.com with ESMTPSA id e19sm4359876wmd.1.2016.03.02.06.01.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 06:01:20 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Wed, 2 Mar 2016 15:00:20 +0100 Message-Id: <1456927221-32421-14-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 13/14] kms_addfb_basic: Move calls to gem_set_tiling to the subtests 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 So they don't cause unrelated subtests to be skipped when testing drivers other than i915. Signed-off-by: Tomeu Vizoso --- tests/kms_addfb_basic.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 6dfaecfc38a7..daba6b9aaeed 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -316,10 +316,8 @@ static void size_tests(int fd) f.fb_id = 0; } - igt_fixture - gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); - igt_subtest("bo-too-small-due-to-tiling") { + gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && errno == EINVAL); } @@ -368,10 +366,8 @@ static void addfb25_tests(int fd) igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); } - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); - igt_subtest("addfb25-X-tiled-mismatch") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; @@ -379,6 +375,7 @@ static void addfb25_tests(int fd) } igt_subtest("addfb25-X-tiled") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED;