public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: jeff.mcgee@intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/3] pm_rps: Convert to subtest structure
Date: Sun, 19 Jan 2014 15:29:29 +0100	[thread overview]
Message-ID: <20140119141038.GA15089@phenom.ffwll.local> (raw)
In-Reply-To: <1389999366-19715-3-git-send-email-jeff.mcgee@intel.com>

On Fri, Jan 17, 2014 at 04:56:05PM -0600, jeff.mcgee@intel.com wrote:
> From: Jeff McGee <jeff.mcgee@intel.com>
> 
> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com>

I've missed that you've forgotten to move the test to the _M Makefile
target. Without that testrunners like piglit won't enumerate the subtests
and run the individually. I've fixed this up now.
-Daniel

> ---
>  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);
> +	}
>  }
> -- 
> 1.8.5.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

  reply	other threads:[~2014-01-19 14:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-17 22:56 More fixes for igt pm_rps jeff.mcgee
2014-01-17 22:56 ` [PATCH 1/3] pm_rps: Add read back checking on sysfs writes jeff.mcgee
2014-01-17 22:56 ` [PATCH 2/3] pm_rps: Convert to subtest structure jeff.mcgee
2014-01-19 14:29   ` Daniel Vetter [this message]
2014-01-17 22:56 ` [PATCH 3/3] pm_rps: Fix verbose option and streamline its use jeff.mcgee
2014-01-18 14:23   ` Daniel Vetter
2014-01-19 21:33   ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140119141038.GA15089@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jeff.mcgee@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox