Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1fa72447: Merge change 24898 into eclair

Browse Source 
Merge commit '1fa724470c4fbe64741ef1fd2eefc4d5438da896' into eclair-plus-aosp

* commit '1fa724470c4fbe64741ef1fd2eefc4d5438da896':
  Fix the parsing for instrumentation result, some Java exceptions are not reported right now
This commit is contained in:
Guang Zhu
2009-09-14 11:34:01 -07:00
committed by Android Git Automerger
parent 920d01f80a 1fa724470c
commit 474443fac4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/DumpRenderTree/assets/run_page_cycler.py
View File

@@ -59,8 +59,18 @@ def main(options, args):
run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runPageCyclerTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runPageCyclerTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix
(adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() (adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
if adb_output.find('INSTRUMENTATION_FAILED') != -1 or \ fail_flag = False
adb_output.find('Process crashed.') != -1: for line in adb_output.splitlines():
line = line.strip()
if line.find('INSTRUMENTATION_CODE') == 0:
if not line[22:] == '-1':
fail_flag = True
break
if (line.find('INSTRUMENTATION_FAILED') != -1 or
line.find('Process crashed.') != -1):
fail_flag = True
break
if fail_flag:
logging.error("Error happened : " + adb_output) logging.error("Error happened : " + adb_output)
sys.exit(1) sys.exit(1)
@@ -80,7 +90,6 @@ def main(options, args):
shell_cmd_str = adb_cmd + " pull " + result_file + " " + results_dir shell_cmd_str = adb_cmd + " pull " + result_file + " " + results_dir
adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
logging.info(adb_output) logging.info(adb_output)
logging.info("Results are stored under: " + results_dir + "/load_test_result.txt\n") logging.info("Results are stored under: " + results_dir + "/load_test_result.txt\n")
if '__main__' == __name__: if '__main__' == __name__: