[Lldb-commits] [lldb] r155505 - /lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py

[Johnny Chen]

Author: johnny
Date: Tue Apr 24 18:33:16 2012
New Revision: 155505

URL: http://llvm.org/viewvc/llvm-project?rev=155505&view=rev
Log:
Make the test case more robust in terms of remote testsuite execution.

rdar://problem/11312971

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

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=155505&r1=155504&r2=155505&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py (original)
+++ lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py Tue Apr 24 18:33:16 2012
@@ -90,7 +90,8 @@
             dylibPath = 'DYLD_LIBRARY_PATH'
 
         # The directory to relocate the dynamic library and its debugging info.
-        new_dir = os.path.join(os.getcwd(), "hidden")
+        special_dir = "hidden"
+        new_dir = os.path.join(os.getcwd(), special_dir)
 
         old_dylib = os.path.join(os.getcwd(), dylibName)
         new_dylib = os.path.join(new_dir, dylibName)
@@ -118,7 +119,7 @@
         # For now we don't track DYLD_LIBRARY_PATH, so the old library will be in
         # the modules list.
         self.expect("target modules list",
-            substrs = [old_dylib],
+            substrs = [os.path.basename(old_dylib)],
             matching=True)
 
         self.runCmd("run")
@@ -128,10 +129,7 @@
         # After run, make sure the hidden library is present, and the one we didn't 
         # load is not.
         self.expect("target modules list",
-            substrs = [new_dylib])
-        self.expect("target modules list",
-            substrs = [old_dylib],
-            matching=False)
+            substrs = [special_dir, os.path.basename(new_dylib)])
 
     def test_lldb_process_load_and_unload_commands(self):
         """Test that lldb process load/unload command work correctly."""