[Piglit] [PATCH] xts: Fix skip handling.

Eric Anholt eric at anholt.net
Wed Jan 27 17:28:31 PST 2016


Commit 23e06ffaa51b9075c1e5e0c220c991efc5609838 broke skip handling by
overwriting the result after we had set it.
---
 tests/xts.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/xts.py b/tests/xts.py
index 6798e70..e528626 100644
--- a/tests/xts.py
+++ b/tests/xts.py
@@ -133,6 +133,8 @@ class XTSTest(Test):  # pylint: disable=too-few-public-methods
         return images
 
     def interpret_result(self):
+        super(XTSTest, self).interpret_result()
+
         try:
             with open(self.test_results_file, 'r') as rfile:
                 log = rfile.read()
@@ -155,13 +157,9 @@ class XTSTest(Test):  # pylint: disable=too-few-public-methods
                 self.result.result = 'warn'
             else:
                 self.result.result = 'fail'
-        else:
-            self.result.result = 'fail'
 
         self.result.images = self._process_log_for_images(log)
 
-        super(XTSTest, self).interpret_result()
-
 
 class RendercheckTest(Test):
     def __init__(self, args):
@@ -169,14 +167,12 @@ class RendercheckTest(Test):
         self.testname = "rendercheck " + " ".join(args)
 
     def interpret_result(self):
+        super(RendercheckTest, self).interpret_result()
+
         if self.result.returncode == 0:
             self.result.result = 'pass'
         elif self.result.returncode == 77:
             self.result.result = 'skip'
-        else:
-            self.result.result = 'fail'
-
-        super(RendercheckTest, self).interpret_result()
 
 
 def _populate_profile_xts(profile):
-- 
2.6.4



More information about the Piglit mailing list