diff options
| author | Guang Zhu <guangzhu@google.com> | 2009-04-16 10:16:36 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2009-04-16 10:21:06 -0700 |
| commit | 23a4e8816266e2cac98d7980ca66748a55b0e09f (patch) | |
| tree | df169ce7485365f67540d64d6e2123743e8aee08 /tests/DumpRenderTree/run_page_cycler.py | |
| parent | 7a430cf152fa6a55be2f04e1318baafb69bb5bc0 (diff) | |
| download | frameworks_base-23a4e8816266e2cac98d7980ca66748a55b0e09f.zip frameworks_base-23a4e8816266e2cac98d7980ca66748a55b0e09f.tar.gz frameworks_base-23a4e8816266e2cac98d7980ca66748a55b0e09f.tar.bz2 | |
* Update the way that run_page_cycler.py detectes instrumentation failures.
* Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
Diffstat (limited to 'tests/DumpRenderTree/run_page_cycler.py')
| -rwxr-xr-x | tests/DumpRenderTree/run_page_cycler.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/run_page_cycler.py b/tests/DumpRenderTree/run_page_cycler.py index 9a099b5..7f728a3 100755 --- a/tests/DumpRenderTree/run_page_cycler.py +++ b/tests/DumpRenderTree/run_page_cycler.py @@ -59,7 +59,8 @@ def main(options, args): run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runTest -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() - if adb_output.find('INSTRUMENTATION_FAILED') != -1: + if adb_output.find('INSTRUMENTATION_FAILED') != -1 or \ + adb_output.find('Process crashed.') != -1: logging.error("Error happened : " + adb_output) sys.exit(1) |