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

[Brian Paul]

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.

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).
---
 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__), '..'))
 
     def __iter__(self):
         for key, values in self.__dict__.iteritems():
-- 
1.7.10.4