aboutsummaryrefslogtreecommitdiff
path: root/test/asan/android_commands/android_run.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/asan/android_commands/android_run.py')
-rwxr-xr-xtest/asan/android_commands/android_run.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/asan/android_commands/android_run.py b/test/asan/android_commands/android_run.py
index 621844fd30a2..272d2110e5ad 100755
--- a/test/asan/android_commands/android_run.py
+++ b/test/asan/android_commands/android_run.py
@@ -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 = "" 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)