diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2014-04-10 15:27:18 -0700 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2014-04-17 08:00:17 -0700 |
| commit | 7d2f44138baf3a0022fbd0503e68e471a9a1aae7 (patch) | |
| tree | 40e63294d923496241730c2443061da023f04f57 /piglit-run.py | |
| parent | 7902d078d9c65361847d15874787203cc73a1d26 (diff) | |
framework: Split TestProfile and related out of core
This solves a dependency loop between core and exectest, laying the
groundwork for future improvements to the exectest module.
Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'piglit-run.py')
| -rwxr-xr-x | piglit-run.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/piglit-run.py b/piglit-run.py index 672c05752..b4b00bc28 100755 --- a/piglit-run.py +++ b/piglit-run.py @@ -31,6 +31,7 @@ import time sys.path.append(path.dirname(path.realpath(sys.argv[0]))) import framework.core as core +import framework.profile def main(): @@ -157,7 +158,7 @@ def main(): for (key, value) in env.collectData().items(): json_writer.write_dict_item(key, value) - profile = core.merge_test_profiles(args.test_profile) + profile = framework.profile.merge_test_profiles(args.test_profile) json_writer.write_dict_key('tests') json_writer.open_dict() |