https://github.com/Michael137 updated https://github.com/llvm/llvm-project/pull/147702
>From 0b995316a9cca1f766b20778eb80b897130f5cca Mon Sep 17 00:00:00 2001 From: Michael Buch <michaelbuc...@gmail.com> Date: Wed, 9 Jul 2025 13:15:06 +0100 Subject: [PATCH 1/2] [lldb][test] Move std::initializer_list from libcxx to generic directory 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 --- .../initializer_list}/Makefile | 3 --- .../TestDataFormatterStdInitializerList.py} | 13 ++++++------- .../initializer_list}/main.cpp | 0 3 files changed, 6 insertions(+), 10 deletions(-) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx/initializerlist => generic/initializer_list}/Makefile (50%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx/initializerlist/TestInitializerList.py => generic/initializer_list/TestDataFormatterStdInitializerList.py} (82%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx/initializerlist => generic/initializer_list}/main.cpp (100%) 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 >From 3ba1efae8c9bb3222a07ed0beb55179bf76f9ac9 Mon Sep 17 00:00:00 2001 From: Michael Buch <michaelbuc...@gmail.com> Date: Wed, 9 Jul 2025 15:07:39 +0100 Subject: [PATCH 2/2] fixup! clang-format --- .../generic/initializer_list/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp index 88fe273ae8e3e..a9d159e0be28a 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/initializer_list/main.cpp @@ -1,12 +1,11 @@ +#include <initializer_list> #include <string> #include <vector> -#include <initializer_list> -int main () -{ - std::initializer_list<int> ili{1,2,3,4,5}; - std::initializer_list<std::string> ils{"1","2","3","4","surprise it is a long string!! yay!!"}; - - return 0; // Set break point at this line. -} +int main() { + std::initializer_list<int> ili{1, 2, 3, 4, 5}; + std::initializer_list<std::string> ils{ + "1", "2", "3", "4", "surprise it is a long string!! yay!!"}; + return 0; // Set break point at this line. +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
