Author: Michael Buch
Date: 2025-07-08T15:22:38+01:00
New Revision: d338d197e7ee6e6f8986e14b2aec9d4c368d8a9e

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

LOG: [lldb][test] Move std::queue from libcxx to generic directory (#147529)

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

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

Added: 
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/Makefile
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/main.cpp

Modified: 
    

Removed: 
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
    
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp


################################################################################
diff  --git 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/Makefile
similarity index 75%
rename from 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
rename to 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/Makefile
index 680e1abfbef58..99998b20bcb05 100644
--- 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile
+++ 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/Makefile
@@ -1,4 +1,3 @@
 CXX_SOURCES := main.cpp
 
-USE_LIBCPP := 1
 include Makefile.rules

diff  --git 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
similarity index 90%
rename from 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
rename to 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
index 53eaf5a23cc07..ac729c5bacb0f 100644
--- 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
+++ 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
@@ -2,14 +2,13 @@
 Test lldb data formatter subsystem.
 """
 
-
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
-class TestDataFormatterLibcxxQueue(TestBase):
+class TestDataFormatterStdQueue(TestBase):
     def setUp(self):
         TestBase.setUp(self)
         self.namespace = "std"
@@ -30,9 +29,9 @@ def check_variable(self, name):
         bugnumber="llvm.org/pr36109", debug_info="gmodules", 
triple=".*-android"
     )
     @add_test_categories(["libc++"])
-    def test(self):
+    def test_libcxx(self):
         """Test that std::queue is displayed correctly"""
-        self.build()
+        self.build(dictionary={"USE_LIBCPP": 1})
         lldbutil.run_to_source_breakpoint(
             self, "// break here", lldb.SBFileSpec("main.cpp", False)
         )

diff  --git 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp
 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/main.cpp
similarity index 54%
rename from 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp
rename to 
lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/main.cpp
index f3b5f32817970..406b437914932 100644
--- 
a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/main.cpp
+++ 
b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/main.cpp
@@ -2,8 +2,8 @@
 #include <vector>
 
 int main() {
-  std::queue<int> q1{{1,2,3,4,5}};
-  std::queue<int, std::vector<int>> q2{{1,2,3,4,5}};
+  std::queue<int> q1{{1, 2, 3, 4, 5}};
+  std::queue<int, std::vector<int>> q2{{1, 2, 3, 4, 5}};
   int ret = q1.size() + q2.size(); // break here
   return ret;
 }


        
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to