From 19c30cc40b6dff7443e5770c9ee2eefd91bf4c86 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Wed, 9 Jul 2025 13:06:23 +0100 Subject: [PATCH] [lldb][test] Move std::valarray from libcxx to generic directory This just moves the test from `libcxx` to `generic`. There are currently no `std::valarray` formatters for libstdc++ so I didn't add a test-case for it. Split out from https://github.com/llvm/llvm-project/pull/146740 --- .../{libcxx => generic}/valarray/Makefile | 2 -- .../valarray/TestDataFormatterStdValarray.py} | 13 +++++++------ .../{libcxx => generic}/valarray/main.cpp | 0 3 files changed, 7 insertions(+), 8 deletions(-) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx => generic}/valarray/Makefile (73%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx/valarray/TestDataFormatterLibcxxValarray.py => generic/valarray/TestDataFormatterStdValarray.py} (96%) rename lldb/test/API/functionalities/data-formatter/data-formatter-stl/{libcxx => generic}/valarray/main.cpp (100%) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/Makefile similarity index 73% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/Makefile rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/Makefile index c5df567e01a2a..99998b20bcb05 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/Makefile +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/Makefile @@ -1,5 +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/valarray/TestDataFormatterLibcxxValarray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py similarity index 96% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/TestDataFormatterLibcxxValarray.py rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py index 613546b50a770..2d70f9ef88b8f 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/TestDataFormatterLibcxxValarray.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py @@ -2,18 +2,14 @@ Test lldb data formatter subsystem. """ - import lldb from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil -class LibcxxChronoDataFormatterTestCase(TestBase): - @add_test_categories(["libc++"]) - def test_with_run_command(self): - """Test that that file and class static variables display correctly.""" - self.build() +class StdValarrayDataFormatterTestCase(TestBase): + def do_test(self): (self.target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint( self, "break here", lldb.SBFileSpec("main.cpp", False) ) @@ -179,3 +175,8 @@ def test_with_run_command(self): error=True, substrs=['array index 3 is not valid for "(indirect_array) ia"'], ) + + @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/valarray/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/main.cpp similarity index 100% rename from lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/valarray/main.cpp rename to lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/main.cpp