[libcxx] r223598 - Revert parts of r223594. Use DYLD_LIBRARY_PATH on OSX when running tests.

Eric Fiselier eric at efcs.ca
Sat Dec 6 16:34:23 PST 2014


Author: ericwf
Date: Sat Dec  6 18:34:23 2014
New Revision: 223598

URL: http://llvm.org/viewvc/llvm-project?rev=223598&view=rev
Log:
Revert parts of r223594. Use DYLD_LIBRARY_PATH on OSX when running tests.

Modified:
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=223598&r1=223597&r2=223598&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Sat Dec  6 18:34:23 2014
@@ -234,6 +234,7 @@ class Configuration(object):
         self.configure_obj_root()
         self.configure_use_system_lib()
         self.configure_use_clang_verify()
+        self.configure_env()
         self.configure_std_flag()
         self.configure_compile_flags()
         self.configure_link_flags()
@@ -558,7 +559,9 @@ class Configuration(object):
             self.lit_config.note(
                 "inferred target_triple as: %r" % self.config.target_triple)
 
-
+    def configure_env(self):
+        if sys.platform == 'darwin' and not self.use_system_lib:
+            self.env['DYLD_LIBRARY_PATH'] = os.path.join(self.obj_root, 'lib')
 
 # name: The name of this test suite.
 config.name = 'libc++'





More information about the cfe-commits mailing list