[Intel-gfx] [PATCH] tests/kms_psr_sink_crc: Use options

[Daniel Vetter]

On Tue, Sep 23, 2014 at 08:51:09PM +0000, Vivi, Rodrigo wrote:
> I had tried options but didn't liked because I was unable to list subtests... so I gave back to env var...
> 
> But now I see that I was probably forgetting igt_subtest_init_parse_opts()

Please poke me next time around you want to do something in igt and it
doesn't seem to be easily possible. Writing tests is a nuisance so I want
to make it as simple and pain-free as possible, and that only works when
people raise issues instead of papering over them.
> 
> Thanks
> 
> Acked/Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Thanks for the review, patch merged.
-Daniel
> 
> ________________________________________
> From: Daniel Vetter [daniel.vetter at ffwll.ch]
> Sent: Tuesday, September 23, 2014 6:16 AM
> To: Intel Graphics Development
> Cc: Daniel Vetter; Vivi, Rodrigo; Vetter, Daniel
> Subject: [PATCH] tests/kms_psr_sink_crc: Use options
> 
> Env variables are a bit more annoying since much harder to discover.
> With options you can just see what they do with --help.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  tests/kms_psr_sink_crc.c | 30 ++++++++++++++++++++++++------
>  1 file changed, 24 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c
> index 767727afea6d..266e7e7b5908 100644
> --- a/tests/kms_psr_sink_crc.c
> +++ b/tests/kms_psr_sink_crc.c
> @@ -468,16 +468,32 @@ static void run_test(data_t *data)
>         }
>  }
> 
> -igt_main
> +static int opt_handler(int opt, int opt_index)
>  {
> -       data_t data = {};
> -       enum operations op;
> -       char *env_psr;
> +       switch (opt) {
> +       case 'n':
> +               running_with_psr_disabled = true;
> +               break;
> +       default:
> +               igt_assert(0);
> +       }
> 
> -       env_psr = getenv("IGT_PSR_DISABLED");
> +       return 0;
> +}
> 
> -       running_with_psr_disabled = (bool) env_psr;
> +int main(int argc, char *argv[])
> +{
> +       const char *help_str =
> +              "  --no-psr\tRun test without PSR to check the CRC test logic.";
> +       static struct option long_options[] = {
> +               {"no-psr", 0, 0, 'n'},
> +               { 0, 0, 0, 0 }
> +       };
> +       data_t data = {};
> +       enum operations op;
> 
> +       igt_subtest_init_parse_opts(argc, argv, "", long_options,
> +                                   help_str, opt_handler);
>         igt_skip_on_simulation();
> 
>         igt_fixture {
> @@ -522,4 +538,6 @@ igt_main
>                 drm_intel_bufmgr_destroy(data.bufmgr);
>                 display_fini(&data);
>         }
> +
> +       igt_exit();
>  }
> --
> 2.1.0

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