diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2013-12-22 20:41:30 -0800 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2014-01-12 01:12:49 -0800 |
| commit | 81a091ae7eee23b7744d5c41268810248c10e634 (patch) | |
| tree | 0d4944dc61a77435ef002e0bba573af033d63f06 /piglit-resume.py | |
| parent | 2b42fa0fc85e6439074b771a64744829ae325527 (diff) | |
Add support to load multiple test profiles
This patch gives piglit run the ability to take one or more test
proflies as arguments rather than just one. It loads the profiles,
merging them from left to right, overwriting conflicting results. This
will allow the oglconform and es3conform loaders to be taken out of
all.tests.
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com>
Diffstat (limited to 'piglit-resume.py')
| -rwxr-xr-x | piglit-resume.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/piglit-resume.py b/piglit-resume.py index 7e456b5af..c6b9b1e1e 100755 --- a/piglit-resume.py +++ b/piglit-resume.py @@ -74,7 +74,7 @@ def main(): json_writer.write_dict_item(key, value) env.exclude_tests.add(key) - profile = core.loadTestProfile(results.options['profile']) + profile = core.merge_test_profiles(results.options['profile']) # This is resumed, don't bother with time since it wont be accurate anyway profile.run(env, json_writer) |