junit: Results' stdout and stderr is now in `out` in `err`.

1 files changed, 23 insertions, 2 deletions

diff --git a/piglit-summary-junit.py b/piglit-summary-junit.py
index 35641f444..6dba15273 100755
--- a/piglit-summary-junit.py
+++ b/piglit-summary-junit.py
@@ -62,14 +62,35 @@ class Writer:
         duration = None
         try:
             try:
-                self.report.addStdout(result['command'] + '\n')
+                command = result['command']
             except KeyError:
                 pass
+            else:
+                self.report.addStdout(command + '\n')
+
+            try:
+                stdout = result['out']
+            except KeyError:
+                pass
+            else:
+                if stdout:
+                    self.report.addStdout(stdout + '\n')
 
             try:
-                self.report.addStderr(result['info'])
+                stderr = result['err']
             except KeyError:
                 pass
+            else:
+                if stderr:
+                    self.report.addStderr(stderr + '\n')
+
+            try:
+                returncode = result['returncode']
+            except KeyError:
+                pass
+            else:
+                if returncode:
+                    self.report.addStderr('returncode = %s\n' % returncode)
 
             success = result.get('result')
             if success in (status.PASS, status.WARN):