[Lldb-commits] [lldb] r136793 - in /lldb/trunk/test: blacklist.py functionalities/load_unload/TestLoadUnload.py

[Jim Ingham]

Author: jingham
Date: Wed Aug  3 12:41:28 2011
New Revision: 136793

URL: http://llvm.org/viewvc/llvm-project?rev=136793&view=rev
Log:
Don't set DYLD_LIBRARY_PATH in the Python environment (which will get passed down to
debugserver) but set it in the debugger settings (which will just get passed down to
the target).

Modified:
    lldb/trunk/test/blacklist.py
    lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py

Modified: lldb/trunk/test/blacklist.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/blacklist.py?rev=136793&r1=136792&r2=136793&view=diff
==============================================================================
--- lldb/trunk/test/blacklist.py (original)
+++ lldb/trunk/test/blacklist.py Wed Aug  3 12:41:28 2011
@@ -13,7 +13,6 @@
              }
 """
 
-blacklist = {'STLTestCase': '<rdar://problem/8837118> Crashed while running the entire test suite',
-    'LoadUnloadTestCase' : 'taking down debugserver and causing the whole test suite to hang'
+blacklist = {'STLTestCase': '<rdar://problem/8837118> Crashed while running the entire test suite'
              # To skip this test case: ./dotest.py -b blacklist.py -v -w 2> ~/Developer/Log/lldbtest.log
              }

Modified: lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py?rev=136793&r1=136792&r2=136793&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py (original)
+++ lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py Wed Aug  3 12:41:28 2011
@@ -115,8 +115,8 @@
         self.runCmd("process kill")
 
         # Try again with the DYLD_LIBRARY_PATH environment variable properly set.
-        os.environ[dylibPath] = new_dir
-        self.addTearDownHook(lambda: os.environ.pop(dylibPath))
+        env_cmd_string = "settings set target.process.env-vars " + dylibPath + "=" + new_dir
+        self.runCmd("env_cmd_string")
         self.runCmd("run")
         self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
             patterns = ["frame #0.*d_function.*at d.c:%d" % self.line_d_function])