From 291fa74292e7c04053d50b2d322c84b0b0e136c3 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Sat, 2 Nov 2013 13:48:56 +0000 Subject: [PATCH] [Android]: Only kill 'adb' during device status check, not all commands with adb in command line. This was causing the perf tests to fail since the bb_device_steps_internal.py had '--adb-root' as an argument and so was being accidentially killed during the device status check. BUG=312285 Review URL: https://codereview.chromium.org/56063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232610 0039d316-1c4b-4281-b951-d872f2087c98 --- build/android/buildbot/bb_device_status_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py index a021bfc892b1..d01fcaad0d1e 100755 --- a/build/android/buildbot/bb_device_status_check.py +++ b/build/android/buildbot/bb_device_status_check.py @@ -256,7 +256,7 @@ def RestartUsb(): def KillAllAdb(): def GetAllAdb(): for p in psutil.process_iter(): - if 'adb' in p.name or 'adb' in ' '.join(p.cmdline): + if 'adb' in p.name: yield p for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]: -- 2.11.4.GIT