summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-12-07 01:28:44 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-12-07 01:28:44 +0000
commit53c23134b85153a0bf6d6a39edf4bb4781a4c53e (patch)
tree9ce6adc854af79ef6ca0c0beadb85e61dbc396c0
parent3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de (diff)
downloadcompiler-rt-53c23134b85153a0bf6d6a39edf4bb4781a4c53e.tar.gz
[sanitizer] Simplify android_run.py.
A test-only change to pass all *SAN_OPTIONS to the device without listing them individually. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@319998 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xtest/sanitizer_common/android_commands/android_run.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/sanitizer_common/android_commands/android_run.py b/test/sanitizer_common/android_commands/android_run.py
index 1c4f4057f..8a97aa5f7 100755
--- a/test/sanitizer_common/android_commands/android_run.py
+++ b/test/sanitizer_common/android_commands/android_run.py
@@ -12,7 +12,7 @@ def build_env():
# Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir.
args.append('LD_LIBRARY_PATH=%s' % (ANDROID_TMPDIR,))
for (key, value) in os.environ.items():
- if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS', 'SCUDO_OPTIONS', 'UBSAN_OPTIONS']:
+ if key in ['ASAN_ACTIVATION_OPTIONS', 'SCUDO_OPTIONS'] or key.endswith('SAN_OPTIONS'):
args.append('%s="%s"' % (key, value))
return ' '.join(args)