From 44ecfd34bd80c036b9dfa3503fab669463769f46 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Mon, 12 Jan 2015 17:10:05 +0000 Subject: [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 --- test/asan/android_commands/android_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.1