[Piglit] [PATCH] core.py: don't overwrite user's PIGLIT_SOURCE_DIR env var

[Dylan Baker]

On Monday, September 22, 2014 11:52:11 AM Brian Paul wrote:
> When creating an Options object, use the environment's PIGLIT_SOURCE_DIR
> value when available.
> 
> Fixes spec/ARB_ES3_compatibility/oes_compressed_etc2_texture-miptree test
> failures in Cywin.
cygwin
> 
> Also, remove the MESA_DEBUG=silent setting.  Piglit shouldn't care if
> debug output is on/off (we stopped looking for Mesa error messages a
> long time ago).

My understanding from Eric's comment (That I think I deleted on
accident) was that with mesa debug not set to silent some tests would
generate so much stdout/stderr chatter that it could crash piglit.

> ---
>  framework/core.py |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/framework/core.py b/framework/core.py
> index f7d6f71..2ca17df 100644
> --- a/framework/core.py
> +++ b/framework/core.py
> @@ -107,12 +107,12 @@ class Options(object):
>          self.sync = sync
>          # env is used to set some base environment variables that are not going
>          # to change across runs, without sending them to os.environ which is
> -        # fickle as easy to break
> -        self.env = {
> -            'PIGLIT_SOURCE_DIR': os.path.abspath(
> -                os.path.join(os.path.dirname(__file__), '..')),
> -            'MESA_DEBUG': 'silent',
> -        }
> +        # fickle and easy to break
> +        self.env = {}
> +        if 'PIGLIT_SOURCE_DIR' in os.environ:
> +            self.env['PIGLIT_SOURCE_DIR'] = os.environ['PIGLIT_SOURCE_DIR']
> +        else:
> +            self.env['PIGLIT_SOURCE_DIR'] = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))

Instead of an if/else could we use dict's get() method? It takes a value
to get, and then a fallback value if that value doesn't exist (default
is None)

self.env = {
    'PIGLIT_SOURCE_DIR': os.environ.get(
		'PIGLIT_SOURCE_DIR',
		os.path.abspath(os.path.join(...))
	)
}

>  
>      def __iter__(self):
>          for key, values in self.__dict__.iteritems():
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140922/54032959/attachment.sig>