summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-15 17:18:02 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-15 17:18:02 -0400
commit617d470dffdc0b5fa24454b0e07438ad0f4721f9 (patch)
treee2667a6f94789c90286577f02e092be8d3955dd9 /tests
parent4d445d682e6380b26fbe5cd06cb0ca4c532739e7 (diff)
parentce8d9d1672e8321466aab745083233239422557d (diff)
downloadframeworks_base-617d470dffdc0b5fa24454b0e07438ad0f4721f9.zip
frameworks_base-617d470dffdc0b5fa24454b0e07438ad0f4721f9.tar.gz
frameworks_base-617d470dffdc0b5fa24454b0e07438ad0f4721f9.tar.bz2
Merge change 25124 into eclair
* changes: Add more error message if the script failed to pull result file from device.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/DumpRenderTree/assets/run_page_cycler.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/DumpRenderTree/assets/run_page_cycler.py b/tests/DumpRenderTree/assets/run_page_cycler.py
index 4a68d72..7dd4a88 100755
--- a/tests/DumpRenderTree/assets/run_page_cycler.py
+++ b/tests/DumpRenderTree/assets/run_page_cycler.py
@@ -88,8 +88,15 @@ def main(options, args):
result_file = "/sdcard/load_test_result.txt"
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]
- logging.info(adb_output)
+ (adb_output, err) = subprocess.Popen(
+ shell_cmd_str, shell=True,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+ if not os.path.isfile(os.path.join(results_dir, "load_test_result.txt")):
+ logging.error("Failed to pull result file.")
+ logging.error("adb stdout:")
+ logging.error(adb_output)
+ logging.error("adb stderr:")
+ logging.error(err)
logging.info("Results are stored under: " + results_dir + "/load_test_result.txt\n")
if '__main__' == __name__: