[Lldb-commits] [lldb] 110ce5a - [lldb][test] TestDataFormatterCpp.py: split assertions failing on Windows

[Michael Buch via lldb-commits]

Author: Michael Buch
Date: 2023-03-07T15:25:38Z
New Revision: 110ce5ab76449f06058e49a154b9b741c75c9d05

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

LOG: [lldb][test] TestDataFormatterCpp.py: split assertions failing on Windows

Differential Revision: https://reviews.llvm.org/D145487

Added: 
    

Modified: 
    lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
    lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index 226cb8fd9ed0..10f6d381cd9a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -11,7 +11,6 @@
 
 
 class CppDataFormatterTestCase(TestBase):
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -286,6 +285,12 @@ def cleanup():
             substrs=['(int) iAmInt = 0x00000001'])
         self.expect("frame variable iAmInt", substrs=['(int) iAmInt = 1'])
 
+    @skipIfWindows
+    def test_mem_func_ptr_formats(self):
+        self.build()
+
+        lldbutil.run_to_name_breakpoint(self, "has_local_mem_func_pointers")
+
         # FIXME: don't format pointer to members as bytes, but rather as regular pointers
         self.expect(
             "frame variable member_ptr",

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
index 1b54acf811e8..868eb73f632b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp
@@ -62,6 +62,16 @@ struct IUseCharStar
         virtual void virt_member_func() {}
 };
 
+void has_local_mem_func_pointers() {
+  const char *IUseCharStar::*member_ptr = &IUseCharStar::pointer;
+  const char *(IUseCharStar::*member_func_ptr)(int) =
+      &IUseCharStar::member_func;
+  auto &ref_to_member_func_ptr = member_func_ptr;
+  
+  void (IUseCharStar::*virt_member_func_ptr)() =
+      &IUseCharStar::virt_member_func;
+}
+
 int main (int argc, const char * argv[])
 {
     
@@ -110,13 +120,7 @@ int main (int argc, const char * argv[])
     
     i_am_cooler the_coolest_guy(1,2,3.14,6.28,'E','G');
 
-    const char *IUseCharStar::*member_ptr = &IUseCharStar::pointer;
-    const char *(IUseCharStar::*member_func_ptr)(int) =
-        &IUseCharStar::member_func;
-    auto &ref_to_member_func_ptr = member_func_ptr;
-
-    void (IUseCharStar::*virt_member_func_ptr)() =
-        &IUseCharStar::virt_member_func;
+    has_local_mem_func_pointers();
 
     return 0; // Set break point at this line.
 }