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-run.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-run.py')
| -rwxr-xr-x | piglit-run.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/piglit-run.py b/piglit-run.py index ea6d1d8a3..cf19073dc 100755 --- a/piglit-run.py +++ b/piglit-run.py @@ -80,7 +80,8 @@ def main(): help="Capture a difference in dmesg before and " "after each test") parser.add_argument("test_profile", - metavar="<Path to test profile>", + metavar="<Path to one or more test profile(s)>", + nargs='+', help="Path to testfile to run") parser.add_argument("results_path", type=path.realpath, @@ -134,7 +135,7 @@ def main(): for (key, value) in env.collectData().items(): json_writer.write_dict_item(key, value) - profile = core.loadTestProfile(args.test_profile) + profile = core.merge_test_profiles(args.test_profile) json_writer.write_dict_key('tests') json_writer.open_dict() |