diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-04-24 21:27:45 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-04-24 21:27:45 +0000 |
| commit | 2c201068dd7b44323f45302c61763a02851321e2 (patch) | |
| tree | 6e7a4eac6d5823cf59dc4c8194066b12b4e18b22 | |
| parent | e22184940b843730b11d403bc2fb28f63f6aca4a (diff) | |
| download | bcm5719-llvm-2c201068dd7b44323f45302c61763a02851321e2.tar.gz bcm5719-llvm-2c201068dd7b44323f45302c61763a02851321e2.zip | |
[asan] Remove asanwrapper from Android test harness.
It is only necessary for pre-L and creates problems on newer builds.
llvm-svn: 301256
| -rwxr-xr-x | compiler-rt/test/asan/android_commands/android_run.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler-rt/test/asan/android_commands/android_run.py b/compiler-rt/test/asan/android_commands/android_run.py index f4ea52bec58..7e599453d1c 100755 --- a/compiler-rt/test/asan/android_commands/android_run.py +++ b/compiler-rt/test/asan/android_commands/android_run.py @@ -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) |
