[Lldb-commits] [lldb] [lldb][test] Move std::initializer_list from libcxx to generic directory (PR #147702)

[via lldb-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Michael Buch (Michael137)

<details>
<summary>Changes</summary>

This just moves the test from `libcxx` to `generic`. There are currently no `std::initializer_list` formatters for libstdc++ so I didn't add a test-case for it.

Split out from https://github.com/llvm/llvm-project/pull/146740

---
Full diff: https://github.com/llvm/llvm-project/pull/147702.diff


3 Files Affected:

- (renamed) lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/Makefile (-3) 
- (renamed) lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/TestDataFormatterStdInitializerList.py (+6-7) 
- (renamed) lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp () 


``````````diff
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/Makefile
similarity index 50%
rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/Makefile
index 98af672c70fbe..99998b20bcb05 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/Makefile
@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS_EXTRAS := -std=c++11
-
-USE_LIBCPP := 1
 
 include Makefile.rules
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/TestDataFormatterStdInitializerList.py
similarity index 82%
rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/TestDataFormatterStdInitializerList.py
index b8a1dd3569d77..133f8f7d56b68 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/TestDataFormatterStdInitializerList.py
@@ -2,7 +2,6 @@
 Test lldb data formatter subsystem.
 """
 
-
 import re
 import lldb
 from lldbsuite.test.decorators import *
@@ -11,10 +10,7 @@
 
 
 class InitializerListTestCase(TestBase):
-    @add_test_categories(["libc++"])
-    def test(self):
-        """Test that that file and class static variables display correctly."""
-        self.build()
+    def do_test(self):
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         bkpt = self.target().FindBreakpointByID(
@@ -25,8 +21,6 @@ def test(self):
 
         self.runCmd("run", RUN_SUCCEEDED)
 
-        lldbutil.skip_if_library_missing(self, self.target(), re.compile(r"libc\+\+"))
-
         # The stop reason of the thread should be breakpoint.
         self.expect(
             "thread list",
@@ -39,3 +33,8 @@ def test(self):
             "frame variable ils",
             substrs=['[4] = "surprise it is a long string!! yay!!"'],
         )
+
+    @add_test_categories(["libc++"])
+    def test_libcxx(self):
+        self.build(dictionary={"USE_LIBCPP": 1})
+        self.do_test()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp
similarity index 100%
rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp

``````````

</details>


https://github.com/llvm/llvm-project/pull/147702