Make message pass in Android testing

test/message/testcfg.py

Index: test/message/testcfg.py
===================================================================
--- test/message/testcfg.py	(revision 12114)
+++ test/message/testcfg.py	(working copy)
@@ -41,9 +41,9 @@
     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)
@@ -62,7 +62,7 @@
       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