Make message pass in Android testing

test/message/testcfg.py

 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 23 matching lines @@
 
 class MessageTestCase(test.TestCase):
 
   def __init__(self, path, file, expected, mode, context, config):
     super(MessageTestCase, self).__init__(context, path, mode)
     self.file = file
     self.expected = expected
     self.config = config
 
   def IgnoreLine(self, str):
-    """Ignore empty lines and valgrind output."""
+    """Ignore empty lines, valgrind output and Android output."""
     if not str: return True
-    else: return str.startswith('==') or str.startswith('**')
+    else: return str.startswith('==') or str.startswith('**') or str.startswith('Error')

[Jakob Kummerow, 2012/07/18 11:52:15]

nit: long line

 
   def IsFailureOutput(self, output):
     f = file(self.expected)
     # Skip initial '#' comment and spaces
     for line in f:
       if (not line.startswith('#')) and (not line.strip()):
         break
     # Convert output lines to regexps that we can match
     env = { 'basename': basename(self.file) }
     patterns = [ ]
     for line in f:
       if not line.strip():
         continue
       pattern = re.escape(line.rstrip() % env)
       pattern = pattern.replace('\\*', '.*')
       pattern = '^%s$' % pattern
       patterns.append(pattern)
     # Compare actual output with the expected
-    raw_lines = output.stdout.split('\n')
+    raw_lines = output.stdout.splitlines()
     outlines = [ s for s in raw_lines if not self.IgnoreLine(s) ]
     if len(outlines) != len(patterns):
       return True
     for i in xrange(len(patterns)):
       if not re.match(patterns[i], outlines[i]):
         return True
     return False
 
   def GetLabel(self):
     return "%s %s" % (self.mode, self.GetName())
@@ skipping 52 matching lines @@
     return ['d8']
 
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'message.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 def GetConfiguration(context, root):
   return MessageTestConfiguration(context, root)