Android test runner: Rename "Error" to "ANDROID"

Review URL: https://chromiumcodereview.appspot.com/10809010
Patch from Haitao Feng <haitao.feng@intel.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12143 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/message/testcfg.py b/test/message/testcfg.py
index 94ec8b720f617d86e54f875970fdc36ba1652230..de46cd68a273aec8caaee3373a0ec337b608655c 100644 (file)
--- a/test/message/testcfg.py
+++ b/test/message/testcfg.py
@@ -44,7 +44,7 @@ class MessageTestCase(test.TestCase):
     """Ignore empty lines, valgrind output and Android output."""
     if not str: return True
     return (str.startswith('==') or str.startswith('**') or
-            str.startswith('Error'))
+            str.startswith('ANDROID'))
 
   def IsFailureOutput(self, output):
     f = file(self.expected)

diff --git a/tools/android-run.py b/tools/android-run.py
index d3969a238376a19411a76e786655002d472ac6c2..1693c5b064b9008a29a50140b9c521312f213fb5 100755 (executable)
--- a/tools/android-run.py
+++ b/tools/android-run.py
@@ -42,7 +42,7 @@ import sys
 import tempfile
 
 def Check(output, errors):
-  failed = any([s.startswith('/system/bin/sh:') or s.startswith('Error')
+  failed = any([s.startswith('/system/bin/sh:') or s.startswith('ANDROID')
                 for s in output.split('\n')])
   return 1 if failed else 0
 
@@ -92,8 +92,8 @@ def Main():
   args = [Escape(arg) for arg in sys.argv[1:]]
   script = (" ".join(args) + "\n"
             "case $? in\n"
-            "  0) break;;\n"
-            "  *) echo \"Error returned by test\";;\n"
+            "  0) ;;\n"
+            "  *) echo \"ANDROID: Error returned by test\";;\n"
             "esac\n")
   script = script.replace(workspace, android_workspace)
   script_file = WriteToTemporaryFile(script)