[Piglit] [PATCH] piglit-run: Fix default search directory for piglit.conf

[Ilia Mirkin]

That'll get it out of the cwd though... not the piglit dir? Where is
the piglit.conf file expected to live? Based on the code, seems like
it was the piglit dir.

On Fri, May 9, 2014 at 3:06 AM, Tom Stellard <thomas.stellard at amd.com> wrote:
> We need to use os.getcwd() now that run.py is its own module.
> ---
>  framework/programs/run.py | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/framework/programs/run.py b/framework/programs/run.py
> index 9c5b033..71865e7 100644
> --- a/framework/programs/run.py
> +++ b/framework/programs/run.py
> @@ -112,8 +112,7 @@ def run(input_):
>          core.PIGLIT_CONFIG.readfp(args.config_file)
>          args.config_file.close()
>      else:
> -        core.PIGLIT_CONFIG.read(os.path.join(os.path.dirname(__file__),
> -                                'piglit.conf'))
> +        core.PIGLIT_CONFIG.read(os.path.join(os.getcwd(), 'piglit.conf'))
>
>      # Pass arguments into Environment
>      env = core.Environment(concurrent=args.concurrency,
> --
> 1.8.1.5
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit