Enables (temporarily) adb trace for sharded perf tests.

This may help track down some issues with adb reliability:
- sharder: sets the env var that will be inherited by the child shards.
- run_command.py: redirect stderr (i.e., trace output) to stdout, otherwise
higher up layers get confused with the extra data.
It will be reverted soon after the data has been collected.

BUG=268450

Review URL: https://chromiumcodereview.appspot.com/22430003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216168 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/third_party/android_testrunner/run_command.py b/third_party/android_testrunner/run_command.py
index 6b84156..5c82c61 100644
--- a/third_party/android_testrunner/run_command.py
+++ b/third_party/android_testrunner/run_command.py
@@ -22,6 +22,7 @@ import subprocess
 import tempfile
 import threading
 import time
+import sys
 
 # local imports
 import errors
@@ -93,12 +94,15 @@ def RunOnce(cmd, timeout_time=None, return_output=True, stdin_input=None):
     stdin_dest = subprocess.PIPE
   else:
     stdin_dest = None
+  stderr_dest = subprocess.STDOUT
+  if os.environ.get('ADB_TRACE'):
+    stderr_dest = sys.stdout
   pipe = subprocess.Popen(
       cmd,
       executable='/bin/bash',
       stdin=stdin_dest,
       stdout=output_dest,
-      stderr=subprocess.STDOUT,
+      stderr=stderr_dest,
       shell=True, close_fds=True,
       preexec_fn=lambda: signal.signal(signal.SIGPIPE, signal.SIG_DFL))