JSON: move info utilities out of root

And into a generic sub element in the output. This makes information
like glxinfo and clinfo not a hard requirement and will allow any sort
of system information to be encoded.

1 files changed, 2 insertions, 8 deletions

diff --git a/framework/results.py b/framework/results.py
index b936298c3..31cb8dff3 100644
--- a/framework/results.py
+++ b/framework/results.py
@@ -298,13 +298,8 @@ class Totals(dict):
 class TestrunResult(object):
     """The result of a single piglit run."""
     def __init__(self):
-        self.name = None
-        self.uname = None
+        self.info = {}
         self.options = {}
-        self.glxinfo = None
-        self.wglinfo = None
-        self.clinfo = None
-        self.lspci = None
         self.time_elapsed = TimeAttribute()
         self.tests = collections.OrderedDict()
         self.totals = collections.defaultdict(Totals)
@@ -372,8 +367,7 @@ class TestrunResult(object):
 
         """
         res = cls()
-        for name in ['name', 'uname', 'options', 'glxinfo', 'wglinfo', 'lspci',
-                     'results_version', 'clinfo']:
+        for name in ['name', 'info', 'options', 'results_version']:
             value = dict_.get(name)
             if value:
                 setattr(res, name, value)