[zorg] r306606 - Fix USER and HOME vars and restart ADB server

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Jun 28 15:30:47 2017
New Revision: 306606

URL: http://llvm.org/viewvc/llvm-project?rev=306606&view=rev
Log:
Fix USER and HOME vars and restart ADB server

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

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh?rev=306606&r1=306605&r2=306606&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Wed Jun 28 15:30:47 2017
@@ -69,6 +69,12 @@ build_android arm armv7-linux-androideab
 build_android x86 i686-linux-android x86
 build_android arm64 aarch64-linux-android arm64-v8a
 
+echo @@@BUILD_STEP restart adb@@@
+export USER=$( id -un )
+export HOME=$( getent passwd "$USER" | cut -d: -f6 )
+ADB_TRACE=all adb kill-server || true
+ADB_TRACE=all adb devices || true
+
 test_android arm armeabi-v7a @@@STEP_FAILURE@@@
 test_android x86 x86 @@@STEP_FAILURE@@@
 test_android arm64 arm64-v8a @@@STEP_FAILURE@@@