fix: use 'official' regex and rename var

Author: jbergstroem

tools/test.py

@@ -49,7 +49,7 @@
 from Queue import Queue, Empty
 
 logger = logging.getLogger('testrunner')
-is_skipped = re.compile(r"# SKIP\S+ (.+)", re.IGNORECASE)
+skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)
 
 VERBOSE = False
 
@@ -257,7 +257,7 @@ def HasRun(self, output):
       for l in output.output.stdout.splitlines():
         logger.info('#' + l)
     elif output.HasSkipped():
-      skip = is_skipped.findall(output.output.stdout)      
+      skip = skip_regex.findall(output.output.stdout)      
       logger.info('ok %i - %s # skip %s' % (self._done, command, skip[0]))
     else:
       logger.info('ok %i - %s' % (self._done, command))
@@ -476,7 +476,7 @@ def UnexpectedOutput(self):
     return not outcome in self.test.outcomes
 
   def HasSkipped(self):
-    skip = is_skipped.search(self.output.stdout)
+    skip = skip_regex.search(self.output.stdout)
     return self.store_unexpected_output and skip
 
   def HasPreciousOutput(self):