summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-01-12 17:10:05 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-01-12 17:10:05 +0000
commit44ecfd34bd80c036b9dfa3503fab669463769f46 (patch)
tree38d5bbdfafc4bd0119e75a6af2db80ec44046e65
parent5dcb09bbbc4ba8cc414f3c5abc67178529ca26c5 (diff)
downloadcompiler-rt-44ecfd34bd80c036b9dfa3503fab669463769f46.tar.gz
[asan] Pass activation options in the android test runner.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@225636 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xtest/asan/android_commands/android_run.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/asan/android_commands/android_run.py b/test/asan/android_commands/android_run.py
index 7f8c612a0..621844fd3 100755
--- a/test/asan/android_commands/android_run.py
+++ b/test/asan/android_commands/android_run.py
@@ -14,7 +14,7 @@ def build_env():
args.append('LD_LIBRARY_PATH=%s:%s' %
(ANDROID_TMPDIR, os.environ.get('LD_LIBRARY_PATH', '')))
for (key, value) in os.environ.items():
- if key in ['ASAN_OPTIONS']:
+ if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
args.append('%s="%s"' % (key, value))
return ' '.join(args)