Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3422)

Unified Diff: build/android/bb_run_sharded_steps.py

Issue 22430003: Enables (temporarily) adb trace for sharded perf tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/android_testrunner/run_command.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/bb_run_sharded_steps.py
diff --git a/build/android/bb_run_sharded_steps.py b/build/android/bb_run_sharded_steps.py
index 9b768a9f7e6214934b46483b365583efadef4101..086a3a13e3154c9858ba6ff6178e72ffedf9f88d 100755
--- a/build/android/bb_run_sharded_steps.py
+++ b/build/android/bb_run_sharded_steps.py
@@ -54,6 +54,7 @@ import os
import signal
import shutil
import sys
+import time
from pylib import android_commands
from pylib import cmd_helper
@@ -174,6 +175,18 @@ def _KillPendingServers():
os.kill(int(pid), signal.SIGQUIT)
except Exception as e:
logging.warning('Failed killing %s %s %s', server, pid, e)
+ # Restart the adb server with full trace, and redirect stderr to stdout
+ # so the extra tracing won't confuse higher up layers.
+ os.environ['ADB_TRACE'] = 'all'
+ cmd_helper.RunCmd(['adb', 'kill-server'])
+ cmd_helper.RunCmd(['adb', 'start-server'])
+ cmd_helper.RunCmd(['adb', 'root'])
+ i = 1
+ while not android_commands.GetAttachedDevices():
+ time.sleep(i)
+ i *= 2
+ if i > 10:
+ break
def main(argv):
« no previous file with comments | « no previous file | third_party/android_testrunner/run_command.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698