diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 01:43:28 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 01:43:28 +0000 |
| commit | a7c1c322df0537cfb91a931633f0bcf488a68937 (patch) | |
| tree | aa471e21c793298a9cdefec69a65c19af60ae9ff /third_party | |
| parent | 44cccca942986a0fa1cec465e35a9ac74d77f73d (diff) | |
| download | chromium_src-a7c1c322df0537cfb91a931633f0bcf488a68937.zip chromium_src-a7c1c322df0537cfb91a931633f0bcf488a68937.tar.gz chromium_src-a7c1c322df0537cfb91a931633f0bcf488a68937.tar.bz2 | |
Revert "Enables (temporarily) adb trace for sharded perf tests."
This reverts crrev.com/216168
BUG=268450
TBR=frankf@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22592002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/android_testrunner/run_command.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/third_party/android_testrunner/run_command.py b/third_party/android_testrunner/run_command.py index 5c82c61..6b84156 100644 --- a/third_party/android_testrunner/run_command.py +++ b/third_party/android_testrunner/run_command.py @@ -22,7 +22,6 @@ import subprocess import tempfile import threading import time -import sys # local imports import errors @@ -94,15 +93,12 @@ 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=stderr_dest, + stderr=subprocess.STDOUT, shell=True, close_fds=True, preexec_fn=lambda: signal.signal(signal.SIGPIPE, signal.SIG_DFL)) |