[compiler-rt] r246891 - [asan] Detect asanwrapper binary in android tests.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Fri Sep  4 17:39:21 2015
New Revision: 246891

URL: http://llvm.org/viewvc/llvm-project?rev=246891&view=rev
Log:
[asan] Detect asanwrapper binary in android tests.

Tests need to be run either via asanwrapper or asanwrapper64
depending in the binary bitness. This matters when testing on an
aarch64 device.

Modified:
    compiler-rt/trunk/test/asan/android_commands/android_run.py

Modified: compiler-rt/trunk/test/asan/android_commands/android_run.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/android_commands/android_run.py?rev=246891&r1=246890&r2=246891&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Fri Sep  4 17:39:21 2015
@@ -18,13 +18,16 @@ def build_env():
             args.append('%s="%s"' % (key, value))
     return ' '.join(args)
 
+is_64bit = (subprocess.check_output(['file', sys.argv[0] + '.real']).find('64-bit') != -1)
+asanwrapper = "asanwrapper64" if is_64bit else "asanwrapper"
+
 device_env = build_env()
 device_args = ' '.join(sys.argv[1:]) # FIXME: escape?
 device_stdout = device_binary + '.stdout'
 device_stderr = device_binary + '.stderr'
 device_exitcode = device_binary + '.exitcode'
-ret = adb(['shell', 'cd %s && %s asanwrapper %s %s >%s 2>%s ; echo $? >%s' %
-           (ANDROID_TMPDIR, device_env, device_binary, device_args,
+ret = adb(['shell', 'cd %s && %s %s %s %s >%s 2>%s ; echo $? >%s' %
+           (ANDROID_TMPDIR, device_env, asanwrapper, device_binary, device_args,
             device_stdout, device_stderr, device_exitcode)])
 if ret != 0:
     sys.exit(ret)