summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree2
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-20 17:39:30 +0100
committerSteve Block <steveblock@google.com>2011-05-24 18:46:34 +0100
commit31e446c3db9031f69641c8ce7be8e396aeb60caa (patch)
tree2643b302439accec66a8eeb6ca7556e58a9b9733 /tests/DumpRenderTree2
parentbdd8a16282cf85bfdbe4c15adcd5c37db772de11 (diff)
downloadframeworks_base-31e446c3db9031f69641c8ce7be8e396aeb60caa.zip
frameworks_base-31e446c3db9031f69641c8ce7be8e396aeb60caa.tar.gz
frameworks_base-31e446c3db9031f69641c8ce7be8e396aeb60caa.tar.bz2
Add extra error handling to DRT2 launcher script
Bug: 3291220 Change-Id: I6f8e57458cd4334a998eb256af303ffcd9c50d64
Diffstat (limited to 'tests/DumpRenderTree2')
-rwxr-xr-xtests/DumpRenderTree2/assets/run_layout_tests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/DumpRenderTree2/assets/run_layout_tests.py b/tests/DumpRenderTree2/assets/run_layout_tests.py
index 3b8c09a..161416a 100755
--- a/tests/DumpRenderTree2/assets/run_layout_tests.py
+++ b/tests/DumpRenderTree2/assets/run_layout_tests.py
@@ -44,9 +44,15 @@ def main(path, options):
logging.info("Running the tests...")
logging.debug("Command = %s" % cmd)
(stdoutdata, stderrdata) = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+ if stderrdata != "":
+ logging.info("Failed to start tests:\n%s", stderrdata)
+ return
if re.search("^INSTRUMENTATION_STATUS_CODE: -1", stdoutdata, re.MULTILINE) != None:
logging.info("Failed to run the tests. Is DumpRenderTree2 installed on the device?")
return
+ if re.search("^OK \([0-9]+ tests?\)", stdoutdata, re.MULTILINE) == None:
+ logging.info("DumpRenderTree2 failed to run correctly:\n%s", stdoutdata)
+ return
logging.info("Downloading the summaries...")