[Lldb-commits] [lldb] r181857 - Need to add the LLDB.framework directory to the rpath for the driver programs or they won't run.

[Jim Ingham]

Author: jingham
Date: Tue May 14 20:11:30 2013
New Revision: 181857

URL: http://llvm.org/viewvc/llvm-project?rev=181857&view=rev
Log:
Need to add the LLDB.framework directory to the rpath for the driver programs or they won't run.

Modified:
    lldb/trunk/test/api/multithreaded/TestMultithreaded.py
    lldb/trunk/test/lldbtest.py

Modified: lldb/trunk/test/api/multithreaded/TestMultithreaded.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/api/multithreaded/TestMultithreaded.py?rev=181857&r1=181856&r2=181857&view=diff
==============================================================================
--- lldb/trunk/test/api/multithreaded/TestMultithreaded.py (original)
+++ lldb/trunk/test/api/multithreaded/TestMultithreaded.py Tue May 14 20:11:30 2013
@@ -56,7 +56,7 @@ class SBBreakpointCallbackCase(TestBase)
     def build_and_test(self, sources, test_name, args = None):
         """ Build LLDB test from sources, and run expecting 0 exit code """
         self.buildDriver(sources, test_name)
-        self.addTearDownHook(lambda: os.remove(test_name))
+        #self.addTearDownHook(lambda: os.remove(test_name))
 
         exe = [os.path.join(os.getcwd(), test_name), self.inferior]
 

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=181857&r1=181856&r2=181857&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Tue May 14 20:11:30 2013
@@ -1181,7 +1181,7 @@ class Base(unittest2.TestCase):
                  'EXE' : exe_name,
                  'CFLAGS_EXTRAS' : "%s -stdlib=libc++" % stdflag,
                  'FRAMEWORK_INCLUDES' : "-F%s" % self.lib_dir,
-                 'LD_EXTRAS' : dsym,
+                 'LD_EXTRAS' : "%s -rpath %s" % (dsym, self.lib_dir),
                 }
         elif sys.platform.startswith("linux") or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile':
             d = {'CXX_SOURCES' : sources,