[compiler-rt] r319998 - [sanitizer] Simplify android_run.py.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Wed Dec  6 17:28:44 2017
New Revision: 319998

URL: http://llvm.org/viewvc/llvm-project?rev=319998&view=rev
Log:
[sanitizer] Simplify android_run.py.

A test-only change to pass all *SAN_OPTIONS to the device without
listing them individually.

Modified:
    compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py

Modified: compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py?rev=319998&r1=319997&r2=319998&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py Wed Dec  6 17:28:44 2017
@@ -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)