Automerge: [lldb][test] Combine libstdc++ and libc++ iterator tests into generic test (#147175)

This combines the libc++ and libstdc++ test cases. The libstdcpp tests
were a subset of the libc++ test, so this patch moves the libcxx test
into generic and removes the libstdcpp test entirely.

There are currently no formatters for libstdcpp
std::unorderd_map::iterator. So I removed those test-cases. We already
test them for libc++ in `libcxx/unordered_map-iterator`. And we test
`std::unordered_map` in `generic/unorderd`. So these test-cases would be
redundant.

Split out from llvm/llvm-project#146740

Author: Michael137

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile renamed to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/Makefile

@@ -1,6 +1,3 @@
 CXX_SOURCES := main.cpp
 
-USE_LIBCPP := 1
-
-CXXFLAGS_EXTRAS := -O0
 include Makefile.rules

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py renamed to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py

@@ -2,25 +2,22 @@
 Test lldb data formatter subsystem.
 """
 
-
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
-class LibcxxIteratorDataFormatterTestCase(TestBase):
+class StdIteratorDataFormatterTestCase(TestBase):
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
         self.namespace = "std"
 
-    @add_test_categories(["libc++"])
-    def test_with_run_command(self):
-        """Test that libc++ iterators format properly."""
-        self.build()
+    def do_test(self):
+        """Test that iterators format properly."""
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
@@ -69,18 +66,12 @@ def cleanup():
         self.expect("frame variable svI", substrs=['item = "hello"'])
         self.expect("expr svI", substrs=['item = "hello"'])
 
-        self.expect("frame variable iiumI", substrs=["first = 61453", "second = 51966"])
-        self.expect("expr iiumI", substrs=["first = 61453", "second = 51966"])
-
-        self.expect("frame variable siumI", substrs=['first = "hello"', "second = 137"])
-        self.expect("expr siumI", substrs=['first = "hello"', "second = 137"])
-
-        self.expect("frame variable iiumI.first", substrs=["first = 61453"])
-        self.expect("frame variable iiumI.first", substrs=["second"], matching=False)
-        self.expect("frame variable iiumI.second", substrs=["second = 51966"])
-        self.expect("frame variable iiumI.second", substrs=["first"], matching=False)
-
-        self.expect("frame variable siumI.first", substrs=['first = "hello"'])
-        self.expect("frame variable siumI.first", substrs=["second"], matching=False)
-        self.expect("frame variable siumI.second", substrs=["second = 137"])
-        self.expect("frame variable siumI.second", substrs=["first"], matching=False)
+    @add_test_categories(["libc++"])
+    def test_libcxx(self):
+        self.build(dictionary={"USE_LIBCPP": 1})
+        self.do_test()
+
+    @add_test_categories(["libstdcxx"])
+    def test_libstdcxx(self):
+        self.build(dictionary={"USE_LIBSTDCPP": 1})
+        self.do_test()

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp renamed to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/main.cpp

@@ -5,16 +5,11 @@
 typedef std::map<int, int> intint_map;
 typedef std::map<std::string, int> strint_map;
 
-typedef std::unordered_map<int, int> intint_umap;
-typedef std::unordered_map<std::string, int> strint_umap;
-
 typedef std::vector<int> int_vector;
 typedef std::vector<std::string> string_vector;
 
 typedef intint_map::iterator ii_map_iter;
 typedef strint_map::iterator si_map_iter;
-typedef intint_umap::iterator ii_umap_iter;
-typedef strint_umap::iterator si_umap_iter;
 
 typedef int_vector::iterator ivter;
 typedef string_vector::iterator svter;
@@ -26,12 +21,6 @@ int main() {
   strint_map sim;
   sim["world"] = 42;
 
-  intint_umap iium;
-  iium[0xF00D] = 0xCAFE;
-
-  strint_umap sium;
-  sium["hello"] = 137;
-
   int_vector iv;
   iv.push_back(3);
 
@@ -40,8 +29,6 @@ int main() {
 
   ii_map_iter iimI = iim.begin();
   si_map_iter simI = sim.begin();
-  ii_umap_iter iiumI = iium.begin();
-  si_umap_iter siumI = sium.begin();
 
   ivter ivI = iv.begin();
   svter svI = sv.begin();