Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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: https://v8.googlecode.com/svn/branches/bleeding_edge@12143 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
  • Loading branch information...
commit 688bb9b23465a5cada4ed155128b5119c90190c6 1 parent 7c830c1
jkummerow@chromium.org authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  test/message/testcfg.py
  2. +3 −3 tools/android-run.py
View
2  test/message/testcfg.py
@@ -44,7 +44,7 @@ def IgnoreLine(self, str):
"""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)
View
6 tools/android-run.py
@@ -42,7 +42,7 @@
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)
Please sign in to comment.
Something went wrong with that request. Please try again.