[Piglit] [PATCH 4/6] gleantest.py: Use new dmesg class

[Dylan Baker]

This allows glean to use the dmesg class to check dmesg.

Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 framework/gleantest.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/framework/gleantest.py b/framework/gleantest.py
index 56968f5..9c55e7a 100644
--- a/framework/gleantest.py
+++ b/framework/gleantest.py
@@ -26,8 +26,10 @@ import subprocess
 
 from core import checkDir, testBinDir, Test, TestResult
 from exectest import ExecTest
+from dmesg import Dmesg
 
 glean_executable = os.path.join(testBinDir, "glean")
+dmesg = Dmesg()
 
 # GleanTest: Execute a sub-test of Glean
 class GleanTest(ExecTest):
@@ -43,7 +45,15 @@ class GleanTest(ExecTest):
         if "{'result': 'skip'}" in out:
             results['result'] = 'skip'
         elif out.find('FAIL') >= 0:
-            results['result'] = 'dmesg-fail' if dmesg else 'fail'
+            results['result'] = 'fail'
+        elif dmesg:
+            results['dmesg'] = {}
+            results['dmesg']['warns'] = dmesg[0]
+            results['dmesg']['fails'] = dmesg[1]
+            if dmesg[1]:
+                results['result'] = 'fail'
+            else:
+                results['result'] = 'warn'
         else:
-            results['result'] = 'dmesg-warn' if dmesg else 'pass'
+            results['result'] = 'pass'
         return out
-- 
1.8.1.5