Add option to specify ADB binary in test runner.

build/android/pylib/device/device_utils_test.py

Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index 65547d420950ee7e661d4a820c6455fed4a2a935..383f32d7dc1f8017cf3ddcd7869a2a9d69573f44 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -180,7 +180,7 @@ class DeviceUtilsOldImplTest(unittest.TestCase):
         expected_cmd, ret = self._cmds[self._total_received]
         self._total_received += 1
         self._test_case.assertTrue(
-            self._comp(expected_cmd, actual_cmd),
+            self._comp(expected_cmd, re.sub(r'/.*/adb', 'adb', actual_cmd)),

[jbudorick, 2014/11/17 23:01:07]

I'm not a fan of this (even if these tests are gradually being deprecated).
re.sub seems like overkill, and there are corner cases where this could do the
wrong thing.

What about mocking out the call to GetAdbPath()?

             msg=on_failure_fmt % (actual_cmd, expected_cmd))
         return ret
       return ''
@@ -198,8 +198,8 @@ class DeviceUtilsOldImplTest(unittest.TestCase):
         for (expected_cmd, _r), (_n, actual_args, actual_kwargs) in zip(
             self._cmds, self._run_command.mocked.mock_calls):
           self._test_case.assertEqual(1, len(actual_args), msg=on_failure)
-          self._test_case.assertTrue(self._comp(expected_cmd, actual_args[0]),
-                                     msg=on_failure)
+          self._test_case.assertTrue(self._comp(expected_cmd,
+              re.sub(r'/.*/adb', 'adb', actual_args[0])), msg=on_failure)
           self._test_case.assertTrue('timeout_time' in actual_kwargs,
                                      msg=on_failure)
           self._test_case.assertTrue('retry_count' in actual_kwargs,