summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2018-12-14 12:44:42 -0800
committerKenneth Graunke <kenneth@whitecape.org>2018-12-14 16:04:07 -0800
commitb227bb35f8b665f40c0acc4546fa4c038c8eb549 (patch)
treee1822d85e1c9aac804d9e8f8573b1670f93418d6
parentbf53cc10c7c4f9ce11b6ffb26115ecc4dc177161 (diff)
Fix 'piglit resume'
metadata.json contains 'force_glsl' but not 'glsl'. I guess it must have gotten renamed at some point. Fixes the following traceback when attempting to call 'piglit resume': Traceback (most recent call last): File "/home/kayden/Projects/piglit/piglit", line 178, in <module> main() File "/home/kayden/Projects/piglit/piglit", line 174, in main sys.exit(runner(args)) File "/home/kayden/Projects/piglit/framework/exceptions.py", line 52, in _inner func(*args, **kwargs) File "/home/kayden/Projects/piglit/framework/programs/run.py", line 439, in resume options.OPTIONS.force_glsl = results.options['glsl'] Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
-rw-r--r--framework/programs/run.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/programs/run.py b/framework/programs/run.py
index df6ebe7aa..d0a3fcfe9 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -436,7 +436,7 @@ def resume(input_):
options.OPTIONS.process_isolation = results.options['process_isolation']
options.OPTIONS.jobs = args.jobs
options.OPTIONS.no_retry = args.no_retry
- options.OPTIONS.force_glsl = results.options['glsl']
+ options.OPTIONS.force_glsl = results.options['force_glsl']
core.get_config(args.config_file)