[zorg] r307616 - [sanitizers] Restart adb server only on buildslave

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Jul 10 20:54:42 2017
New Revision: 307616

URL: http://llvm.org/viewvc/llvm-project?rev=307616&view=rev
Log:
[sanitizers] Restart adb server only on buildslave

Sometimes it's very convenient to forward port 5037 using ssh and run
buildbot_android.sh manually to use remote devices. If script restarts adb server
it will not be able to restart it remotely as local instance will be started
with different set of devices.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=307616&r1=307615&r2=307616&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Mon Jul 10 20:54:42 2017
@@ -131,7 +131,9 @@ function test_on_device {
 }
 
 function test_android {
-  restart_adb_server
+  if [[ "${BUILDBOT_SLAVENAME:-}" != "" ]]; then
+    restart_adb_server
+  fi
 
   ADB=adb
   echo @@@BUILD_STEP run tests@@@