From patchwork Wed Feb 12 15:54:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 3638581 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 D6FE09F35F for ; Wed, 12 Feb 2014 15:54:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D963420158 for ; Wed, 12 Feb 2014 15:54:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EB0AD2012B for ; Wed, 12 Feb 2014 15:54:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B9ECFA333; Wed, 12 Feb 2014 07:54:33 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 95540FA333 for ; Wed, 12 Feb 2014 07:54:31 -0800 (PST) Received: by mail-we0-f174.google.com with SMTP id w61so461827wes.19 for ; Wed, 12 Feb 2014 07:54:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=DAcQbfR5MaBIuNO+ZwMlUp9cy9fUkkTQzXQ7/H0jI/s=; b=joCdN37YvhtuJWcP8gsf+61PWu0qX+861fXH2ablb0u2hgG/NW+vjgiqnFD4oG4tcv 0Ky3U4a/9jB7HKZYJhGXX8KRM6t3dy1DGemk2iNof6xrAJpZ6XMsoSNQJ3Cg5q0aAWcF 33WSGEEgKZdhHQgy6eEYc02xOpnwMU6APpNZ7ZKUE2oPzJLMXK3U9XzKVcztm25KkVis 2Z/mt4IVwE5+XMIjwzTjSOqD3q6X1y8b4+ziNhQ66VYrWhwoOCE30SV0FjTIt/g00ebF krExh+liB19xLSdEPR+11N3HWK+I9g+sKBpvsqismvlAjQf6IvVvS74ytkqTf72egOMA 932Q== X-Gm-Message-State: ALoCoQm7JxalrI8tvut9EfX8beLJmXJULx0IO7IZ1WLHZibOHZc/kkmg3B816ySnV8Jwno0neS3u X-Received: by 10.181.12.9 with SMTP id em9mr2607715wid.37.1392220470575; Wed, 12 Feb 2014 07:54:30 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id de3sm9899725wjb.8.2014.02.12.07.54.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Feb 2014 07:54:29 -0800 (PST) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Wed, 12 Feb 2014 15:54:27 +0000 Message-Id: <1392220467-12907-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.8.5.3 Subject: [Intel-gfx] [PATCH i-g-t] tests: fix sub-test enumeration 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Ensure sub-tests can be listed correctly by doing any test setup within an igt_fixture block. Signed-off-by: Thomas Wood --- tests/gem_evict_alignment.c | 7 ++++--- tests/gem_pwrite_pread.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c index 15c4707..c478f18 100644 --- a/tests/gem_evict_alignment.c +++ b/tests/gem_evict_alignment.c @@ -189,11 +189,12 @@ igt_main igt_skip_on_simulation(); - igt_fixture + igt_fixture { fd = drm_open_any(); - igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7, - "BLIT commands not yet updated\n"); + igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7, + "BLIT commands not yet updated\n"); + } igt_subtest("minor-normal") { size = 1024 * 1024; diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c index 1ae0820..8f768b3 100644 --- a/tests/gem_pwrite_pread.c +++ b/tests/gem_pwrite_pread.c @@ -380,9 +380,9 @@ int main(int argc, char **argv) gem_set_caching(fd, src, 0); gem_set_caching(fd, dst, 0); - } - devid = intel_get_drm_devid(fd); + devid = intel_get_drm_devid(fd); + } igt_subtest("uncached-copy-correctness") test_copy(fd, src, dst, tmp, object_size);