[Lldb-commits] [lldb] e33302f - Revert "[lldb][test] TestLocationListLookup.py: skip expr check on unsupported platforms (#74818)"

[Mikhail Goncharov via lldb-commits]

Author: Mikhail Goncharov
Date: 2023-12-08T11:39:10+01:00
New Revision: e33302fa1279d0a15aac18eca3f0311669bfe328

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

LOG: Revert "[lldb][test] TestLocationListLookup.py: skip expr check on unsupported platforms (#74818)"

This reverts commit 11a7e5781c6363ca3061f57f3aa7e49164673821.

Test fails: https://lab.llvm.org/buildbot/#/builders/219/builds/7416 and
others.

Added: 
    

Modified: 
    lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
index ccee3bfde3f5de..07f306a6ed78b6 100644
--- a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
+++ b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
@@ -7,7 +7,10 @@
 
 
 class LocationListLookupTestCase(TestBase):
-    def launch(self) -> lldb.SBProcess:
+    @skipIf(oslist=["linux"], archs=["arm"])
+    def test_loclist(self):
+        self.build()
+
         exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
@@ -19,31 +22,15 @@ def launch(self) -> lldb.SBProcess:
         self.assertTrue(process.IsValid())
         self.assertTrue(process.is_stopped)
 
-        return process
-
-    def check_local_vars(self, process: lldb.SBProcess, check_expr: bool):
         # Find `bar` on the stack, then
         # make sure we can read out the local
         # variables (with both `frame var` and `expr`)
         for f in process.GetSelectedThread().frames:
-            frame_name = f.GetDisplayFunctionName()
-            if frame_name is not None and frame_name.startswith("Foo::bar"):
+            if f.GetDisplayFunctionName().startswith("Foo::bar"):
                 argv = f.GetValueForVariablePath("argv").GetChildAtIndex(0)
                 strm = lldb.SBStream()
                 argv.GetDescription(strm)
                 self.assertNotEqual(strm.GetData().find("a.out"), -1)
 
-                if check_expr:
-                    process.GetSelectedThread().SetSelectedFrame(f.idx)
-                    self.expect_expr("this", result_type="Foo *")
-
-    @skipIf(oslist=["linux"], archs=["arm"])
-    @skipIfDarwin
-    def test_loclist_frame_var(self):
-        self.build()
-        self.check_local_vars(self.launch(), check_expr=False)
-
-    @skipUnlessDarwin
-    def test_loclist_expr(self):
-        self.build()
-        self.check_local_vars(self.launch(), check_expr=True)
+                process.GetSelectedThread().SetSelectedFrame(f.idx)
+                self.expect_expr("this", result_type="Foo *")