[compiler-rt] r286321 - [asan] Ignore host LD_LIBRARY_PATH in device tests.

Evgeniy Stepanov via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 8 16:33:43 PST 2016


Author: eugenis
Date: Tue Nov  8 18:33:43 2016
New Revision: 286321

URL: http://llvm.org/viewvc/llvm-project?rev=286321&view=rev
Log:
[asan] Ignore host LD_LIBRARY_PATH in device tests.

I'm not sure why is it there, but it is breaking tests on Android N
because of unexpected linker output about an empty LD_LIBRARY_PATH
entry.

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

Modified: compiler-rt/trunk/test/asan/android_commands/android_run.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/android_commands/android_run.py?rev=286321&r1=286320&r2=286321&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Tue Nov  8 18:33:43 2016
@@ -11,8 +11,7 @@ device_binary = os.path.join(ANDROID_TMP
 def build_env():
     args = []
     # Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir.
-    args.append('LD_LIBRARY_PATH=%s:%s' %
-                (ANDROID_TMPDIR, os.environ.get('LD_LIBRARY_PATH', '')))
+    args.append('LD_LIBRARY_PATH=%s' % (ANDROID_TMPDIR,))
     for (key, value) in os.environ.items():
         if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
             args.append('%s="%s"' % (key, value))




More information about the llvm-commits mailing list