[compiler-rt] df2940a - [android] Fix testing adb call

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 18 17:24:18 PST 2021


Author: Vitaly Buka
Date: 2021-02-18T17:24:07-08:00
New Revision: df2940aa85f0265c5f718cb23546404246667b99

URL: https://github.com/llvm/llvm-project/commit/df2940aa85f0265c5f718cb23546404246667b99
DIFF: https://github.com/llvm/llvm-project/commit/df2940aa85f0265c5f718cb23546404246667b99.diff

LOG: [android] Fix testing adb call

Looks like some debug leftover which force another retry.

Added: 
    

Modified: 
    compiler-rt/test/sanitizer_common/android_commands/android_common.py

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/sanitizer_common/android_commands/android_common.py b/compiler-rt/test/sanitizer_common/android_commands/android_common.py
index 8a1d8ca31a46..eb15c34ed52f 100644
--- a/compiler-rt/test/sanitizer_common/android_commands/android_common.py
+++ b/compiler-rt/test/sanitizer_common/android_commands/android_common.py
@@ -22,8 +22,6 @@ def adb(args, attempts = 1, timeout_sec = 600):
     while attempts > 0 and ret != 0:
       attempts -= 1
       ret = subprocess.call(['timeout', str(timeout_sec), ADB] + args, stdout=out, stderr=subprocess.STDOUT)
-      if attempts != 0:
-        ret = 5
     if ret != 0:
       print "adb command failed", args
       print tmpname


        


More information about the llvm-commits mailing list