From ab25e46ff0e66a84b682bbdacbb90d5472507599 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Thu, 3 Jul 2025 11:30:59 +0100 Subject: [PATCH 1/2] [lldb][test] Turn std::chrono libcxx test generic Split out from #146740 --- .../{libcxx => generic}/chrono/Makefile | 4 +--- .../chrono/TestDataFormatterStdChrono.py} | 13 ++++++++----- .../{libcxx => generic}/chrono/main.cpp | 0 3 files changed, 9 insertions(+), 8 deletions(-) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx => generic}/chrono/Makefile (82%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx/chrono/TestDataFormatterLibcxxChrono.py => generic/chrono/TestDataFormatterStdChrono.py} (98%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx => generic}/chrono/main.cpp (100%) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/Makefile similarity index 82% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/Makefile index 57540fc1a2816..4f79c0a900c3a 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/Makefile +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/Makefile @@ -1,6 +1,4 @@ CXX_SOURCES := main.cpp - -USE_LIBCPP := 1 - CXXFLAGS_EXTRAS := -std=c++20 + include Makefile.rules diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/TestDataFormatterLibcxxChrono.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py similarity index 98% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/TestDataFormatterLibcxxChrono.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py index 0737a5bc7e6eb..4952eb3ae8464 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/TestDataFormatterLibcxxChrono.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py @@ -9,13 +9,10 @@ from lldbsuite.test import lldbutil -class LibcxxChronoDataFormatterTestCase(TestBase): - @add_test_categories(["libc++"]) - @skipIf(compiler="clang", compiler_version=["<", "17.0"]) - def test_with_run_command(self): +class StdChronoDataFormatterTestCase(TestBase): + def do_test(self): """Test that that file and class static variables display correctly.""" isNotWindowsHost = lldbplatformutil.getHostPlatform() != "windows" - self.build() (self.target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint( self, "break here", lldb.SBFileSpec("main.cpp", False) ) @@ -433,3 +430,9 @@ def test_with_run_command(self): "ymwdl_2024_last_tuesday_january = year=2024 month=January weekday=Tuesday index=last" ], ) + + @skipIf(compiler="clang", compiler_version=["<", "17.0"]) + @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/chrono/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/main.cpp similarity index 100% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/chrono/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/main.cpp From 6a0a5e32e3750f556e78063f66b5ace864a4388a Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Thu, 3 Jul 2025 15:00:09 +0100 Subject: [PATCH 2/2] fixup! python format --- .../generic/chrono/TestDataFormatterStdChrono.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py index 4952eb3ae8464..013a1787bc4bf 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/chrono/TestDataFormatterStdChrono.py @@ -2,7 +2,6 @@ Test lldb data formatter subsystem. """ - import lldb from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * @@ -434,5 +433,5 @@ def do_test(self): @skipIf(compiler="clang", compiler_version=["<", "17.0"]) @add_test_categories(["libc++"]) def test_libcxx(self): - self.build(dictionary={"USE_LIBCPP" : 1}) + self.build(dictionary={"USE_LIBCPP": 1}) self.do_test()