[compiler-rt] r251359 - [asan] Don't use asanwrapper in 64-bit android tests.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Mon Oct 26 17:19:44 2015
New Revision: 251359

URL: http://llvm.org/viewvc/llvm-project?rev=251359&view=rev
Log:
[asan] Don't use asanwrapper in 64-bit android tests.

Asanwrapper is required on older android versions to work around undesired
linker behavior. It is not required on L and newer, and does not fully
support multiarch devices.

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=251359&r1=251358&r2=251359&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Mon Oct 26 17:19:44 2015
@@ -19,14 +19,14 @@ def build_env():
     return ' '.join(args)
 
 is_64bit = (subprocess.check_output(['file', sys.argv[0] + '.real']).find('64-bit') != -1)
-asanwrapper = "asanwrapper64" if is_64bit else "asanwrapper"
+asanwrapper = "" 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 %s %s %s >%s 2>%s ; echo $? >%s' %
+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: