From 89f3fbb9715fda3853701035f9876a707b43ce41 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 11 Feb 2016 00:16:28 +0000 Subject: [PATCH] [asan] Dump adb output on failure. This is an asan/android test harness change aiming to catch "adb pull" failures on the buildbot. llvm-svn: 260473 --- compiler-rt/test/asan/android_commands/android_common.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler-rt/test/asan/android_commands/android_common.py b/compiler-rt/test/asan/android_commands/android_common.py index 43ac7b4..9f8775f 100644 --- a/compiler-rt/test/asan/android_commands/android_common.py +++ b/compiler-rt/test/asan/android_commands/android_common.py @@ -11,8 +11,18 @@ if os.environ.get('ANDROID_RUN_VERBOSE') == '1': def adb(args): if verbose: print args - devnull = open(os.devnull, 'w') - return subprocess.call([ADB] + args, stdout=devnull, stderr=subprocess.STDOUT) + tmpname = tempfile.mktemp() + out = open(tmpname, 'w') + ret = subprocess.call([ADB] + args, stdout=out, stderr=subprocess.STDOUT) + if ret != 0: + print "adb command failed", args + print tmpname + out.close() + out = open(tmpname, 'r') + print out.read() + out.close() + os.unlink(tmpname) + return ret def pull_from_device(path): tmp = tempfile.mktemp() -- 2.7.4