[Lldb-commits] [lldb] bbae066 - [lldb] Fix TestStopOnSharedlibraryEvents.py on linux

[Pavel Labath via lldb-commits]

Author: Pavel Labath
Date: 2021-03-30T17:38:51+02:00
New Revision: bbae06652e076a35b94acf84e67602ffbdc5c071

URL: https://github.com/llvm/llvm-project/commit/bbae06652e076a35b94acf84e67602ffbdc5c071
DIFF: https://github.com/llvm/llvm-project/commit/bbae06652e076a35b94acf84e67602ffbdc5c071.diff

LOG: [lldb] Fix TestStopOnSharedlibraryEvents.py on linux

and hopefully other ELF OSes. The problem was a missing "extra_images"
startup argument (which ensures LD_LIBRARY_PATH is set properly).

Added: 
    

Modified: 
    lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py b/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
index 18962d1443e0..77d08fec3707 100644
--- a/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
+++ b/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
@@ -9,13 +9,13 @@ class TestStopOnSharedlibraryEvents(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @skipIfRemote
-    @skipUnlessDarwin
+    @skipIfWindows
     @no_debug_info_test
     def test_stopping_breakpoints(self):
         self.do_test()
 
     @skipIfRemote
-    @skipUnlessDarwin
+    @skipIfWindows
     @no_debug_info_test
     def test_auto_continue(self):
         def auto_continue(bkpt):
@@ -23,15 +23,15 @@ def auto_continue(bkpt):
         self.do_test(auto_continue)
 
     @skipIfRemote
+    @skipIfWindows
     @no_debug_info_test
-    @skipUnlessDarwin
     def test_failing_condition(self):
         def condition(bkpt):
             bkpt.SetCondition("1 == 2")
         self.do_test(condition)
         
     @skipIfRemote
-    @skipUnlessDarwin
+    @skipIfWindows
     @no_debug_info_test
     def test_continue_callback(self):
         def bkpt_callback(bkpt):
@@ -43,7 +43,8 @@ def do_test(self, bkpt_modifier = None):
         main_spec = lldb.SBFileSpec("main.cpp")
         # Launch and stop before the dlopen call.
         target, process, thread, _ = lldbutil.run_to_source_breakpoint(self,
-                                                                  "// Set a breakpoint here", main_spec)
+                "// Set a breakpoint here", main_spec, extra_images=["load_a",
+                    "load_b"])
 
         # Now turn on shared library events, continue and make sure we stop for the event.
         self.runCmd("settings set target.process.stop-on-sharedlibrary-events 1")