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

Tom Stellard thomas.stellard at amd.com
Fri May 9 01:52:34 PDT 2014


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,
-- 
1.8.1.5



More information about the Piglit mailing list