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

Dylan Baker baker.dylan.c at gmail.com
Fri May 9 08:12:49 PDT 2014


On Friday, May 09, 2014 04:52:34 Tom Stellard wrote:
> We need to use PIGLIT_SOURCE_DIR now that run.py is its own module.
> 
> v2:
>   - Use PIGLIT_SOURCE_DIR instead of os.getcwd()
> ---
>  framework/programs/run.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/framework/programs/run.py b/framework/programs/run.py
> index 9c5b033..2337b8e 100644
> --- a/framework/programs/run.py
> +++ b/framework/programs/run.py
> @@ -112,8 +112,8 @@ 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.environ['PIGLIT_SOURCE_DIR'],
> +	                        'piglit.conf'))
>  
>      # Pass arguments into Environment
>      env = core.Environment(concurrent=args.concurrency,
> 

This looks good,

Reviewed-by: Dylan Baker <baker.dylan.c at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140509/f5f43a38/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140509/f5f43a38/attachment-0001.sig>


More information about the Piglit mailing list