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
parent 5f42d27f
...@@ -44,7 +44,7 @@ class MessageTestCase(test.TestCase): ...@@ -44,7 +44,7 @@ class MessageTestCase(test.TestCase):
"""Ignore empty lines, valgrind output and Android output.""" """Ignore empty lines, valgrind output and Android output."""
if not str: return True if not str: return True
return (str.startswith('==') or str.startswith('**') or return (str.startswith('==') or str.startswith('**') or
str.startswith('Error')) str.startswith('ANDROID'))
def IsFailureOutput(self, output): def IsFailureOutput(self, output):
f = file(self.expected) f = file(self.expected)
......
...@@ -42,7 +42,7 @@ import sys ...@@ -42,7 +42,7 @@ import sys
import tempfile import tempfile
def Check(output, errors): 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')]) for s in output.split('\n')])
return 1 if failed else 0 return 1 if failed else 0
...@@ -92,8 +92,8 @@ def Main(): ...@@ -92,8 +92,8 @@ def Main():
args = [Escape(arg) for arg in sys.argv[1:]] args = [Escape(arg) for arg in sys.argv[1:]]
script = (" ".join(args) + "\n" script = (" ".join(args) + "\n"
"case $? in\n" "case $? in\n"
" 0) break;;\n" " 0) ;;\n"
" *) echo \"Error returned by test\";;\n" " *) echo \"ANDROID: Error returned by test\";;\n"
"esac\n") "esac\n")
script = script.replace(workspace, android_workspace) script = script.replace(workspace, android_workspace)
script_file = WriteToTemporaryFile(script) script_file = WriteToTemporaryFile(script)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment