maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[asan] Remove asanwrapper from Android test harness. 

It is only necessary for pre-L and creates problems on newer builds.

llvm-svn: 301256
This commit is contained in:
Evgeniy Stepanov 2017-04-24 21:27:45 +00:00
parent e22184940b
commit 2c201068dd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler-rt/test/asan/android_commands/android_run.py
View File

@ -18,15 +18,14 @@ def build_env():
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 %s%s %s >%s 2>%s ; echo $? >%s' %
(ANDROID_TMPDIR, device_env, asanwrapper, device_binary, device_args,
ret = adb(['shell', 'cd %s && %s %s %s >%s 2>%s ; echo $? >%s' %
(ANDROID_TMPDIR, device_env, device_binary, device_args,
device_stdout, device_stderr, device_exitcode)])
if ret != 0:
sys.exit(ret)