diff options
| author | Dylan Baker <dylanx.c.baker@intel.com> | 2014-08-19 10:55:46 -0700 |
|---|---|---|
| committer | Dylan Baker <dylanx.c.baker@intel.com> | 2014-08-26 17:23:35 -0700 |
| commit | 0ee34e6b34c22de7d4df1177fe777319183f0e23 (patch) | |
| tree | 6576dd09cef00ff167dc0d227bfd1d5769525496 /framework/core.py | |
| parent | f01c5ab341ff9b55d704f4bee03d51e0ed472757 (diff) | |
core.py: Fix bug in get_config
A bug was introduced in 9e0c3ee1, this fixes it.
Because the get_config needs to find the piglit root, it has a hard
coded path to look for <current file>/../.. which worked when it was in
framework/programs/run.py, but in the mentioned commit the function was
moved to framework/core.py, a level down, so the hard coded path no
longer worked. This patch removes a '..', so the function now searches
for the right depth.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'framework/core.py')
| -rw-r--r-- | framework/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/core.py b/framework/core.py index bf41391f9..f7d6f7134 100644 --- a/framework/core.py +++ b/framework/core.py @@ -49,7 +49,7 @@ def get_config(arg=None): for d in ['.', os.environ.get('XDG_CONFIG_HOME', os.path.expandvars('$HOME/.config')), - os.path.join(os.path.dirname(__file__), '..', '..')]: + os.path.join(os.path.dirname(__file__), '..')]: try: with open(os.path.join(d, 'piglit.conf'), 'r') as f: PIGLIT_CONFIG.readfp(f) |