From patchwork Fri Jan 17 22:56:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jeff.mcgee@intel.com X-Patchwork-Id: 3507581 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 8D3219F39C for ; Fri, 17 Jan 2014 22:49:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B23AA2017E for ; Fri, 17 Jan 2014 22:49:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CC6892018E for ; Fri, 17 Jan 2014 22:49:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10C30FBF6D; Fri, 17 Jan 2014 14:49:51 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E0CFFFBF1C for ; Fri, 17 Jan 2014 14:49:39 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 17 Jan 2014 14:49:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,676,1384329600"; d="scan'208";a="460716974" Received: from jeffdesk.fso.intel.com ([10.5.53.1]) by fmsmga001.fm.intel.com with ESMTP; 17 Jan 2014 14:49:36 -0800 From: jeff.mcgee@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Jan 2014 16:56:05 -0600 Message-Id: <1389999366-19715-3-git-send-email-jeff.mcgee@intel.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1389999366-19715-1-git-send-email-jeff.mcgee@intel.com> References: <1389999366-19715-1-git-send-email-jeff.mcgee@intel.com> Subject: [Intel-gfx] [PATCH 2/3] pm_rps: Convert to subtest structure 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.5 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 From: Jeff McGee Signed-off-by: Jeff McGee --- tests/pm_rps.c | 119 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/tests/pm_rps.c b/tests/pm_rps.c index ec07dd2..4d64f0a 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -142,66 +142,71 @@ static void pm_rps_exit_handler(int sig) } } -igt_simple_main +igt_main { - const int device = drm_get_card(); - struct junk *junk = stuff; - int fd, ret; - igt_skip_on_simulation(); - /* Use drm_open_any to verify device existence */ - fd = drm_open_any(); - close(fd); - - do { - int val = -1; - char *path; - ret = asprintf(&path, sysfs_base_path, device, junk->name); - igt_assert(ret != -1); - junk->filp = fopen(path, junk->mode); - igt_require(junk->filp); - setbuf(junk->filp, NULL); - - val = readval(junk->filp); - igt_assert(val >= 0); - junk++; - } while(junk->name != NULL); - - origmin = fmin; - origmax = fmax; - - igt_install_exit_handler(pm_rps_exit_handler); - - if (verbose) - printf("Original min = %d\nOriginal max = %d\n", origmin, origmax); - - if (verbose) - dumpit(); - - checkit(); - setfreq(origmin); - if (verbose) - dumpit(); - igt_assert(fcur == fmin); - setfreq(origmax); - if (verbose) - dumpit(); - igt_assert(fcur == fmax); - checkit(); - - /* And some errors */ - writeval_inval(stuff[MIN].filp, frpn - 1); - writeval_inval(stuff[MAX].filp, frp0 + 1000); - checkit(); - - writeval_inval(stuff[MIN].filp, fmax + 1000); - writeval_inval(stuff[MAX].filp, fmin - 1); - checkit(); + igt_fixture { + const int device = drm_get_card(); + struct junk *junk = stuff; + int fd, ret; + + /* Use drm_open_any to verify device existence */ + fd = drm_open_any(); + close(fd); + + do { + int val = -1; + char *path; + ret = asprintf(&path, sysfs_base_path, device, junk->name); + igt_assert(ret != -1); + junk->filp = fopen(path, junk->mode); + igt_require(junk->filp); + setbuf(junk->filp, NULL); + + val = readval(junk->filp); + igt_assert(val >= 0); + junk++; + } while(junk->name != NULL); + + origmin = fmin; + origmax = fmax; + + igt_install_exit_handler(pm_rps_exit_handler); + } - writeval_inval(stuff[MIN].filp, 0x11111110); - writeval_inval(stuff[MAX].filp, 0); + igt_subtest("min-max-config-at-idle") { + if (verbose) + printf("Original min = %d\nOriginal max = %d\n", + origmin, origmax); + + if (verbose) + dumpit(); + + checkit(); + setfreq(origmin); + if (verbose) + dumpit(); + igt_assert(fcur == fmin); + setfreq(origmax); + if (verbose) + dumpit(); + igt_assert(fcur == fmax); + checkit(); + + /* And some errors */ + writeval_inval(stuff[MIN].filp, frpn - 1); + writeval_inval(stuff[MAX].filp, frp0 + 1000); + checkit(); + + writeval_inval(stuff[MIN].filp, fmax + 1000); + writeval_inval(stuff[MAX].filp, fmin - 1); + checkit(); + + writeval_inval(stuff[MIN].filp, 0x11111110); + writeval_inval(stuff[MAX].filp, 0); - writeval(stuff[MIN].filp, origmin); - writeval(stuff[MAX].filp, origmax); + writeval(stuff[MIN].filp, origmin); + writeval(stuff[MAX].filp, origmax); + } }