diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2014-05-09 03:03:18 -0400 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2014-05-09 12:19:53 -0400 |
| commit | b3cb31ba002305af775baa235d1eaaed16d5d777 (patch) | |
| tree | 3a800db195df25c93cb3d5318198a34fb58e7323 /framework | |
| parent | 87c0583c8830fe589050a7abb4d92c6c52579f45 (diff) | |
piglit-run: Fix default search directory for piglit.conf v2
We need to use PIGLIT_SOURCE_DIR now that run.py is its own module.
v2:
- Use PIGLIT_SOURCE_DIR instead of os.getcwd()
Reviewed-by: Dylan Baker <baker.dylan.c@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/programs/run.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/programs/run.py b/framework/programs/run.py index 9c5b03313..2337b8e4f 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, |