https://github.com/oontvoo updated https://github.com/llvm/llvm-project/pull/129921
>From 38f07a83ff621ae4879e4b0cbc8bd361d0b12a93 Mon Sep 17 00:00:00 2001 From: Vy Nguyen <v...@google.com> Date: Wed, 5 Mar 2025 14:45:24 -0500 Subject: [PATCH 1/3] [LLDB]Fix test crash Unregister the fake manager at end of test (https://github.com/llvm/llvm-project/issues/129910) --- lldb/unittests/Core/TelemetryTest.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lldb/unittests/Core/TelemetryTest.cpp b/lldb/unittests/Core/TelemetryTest.cpp index 0e9f329110872..5b762ae816362 100644 --- a/lldb/unittests/Core/TelemetryTest.cpp +++ b/lldb/unittests/Core/TelemetryTest.cpp @@ -11,6 +11,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" #include "llvm/Telemetry/Telemetry.h" +#include "TestingSupport/SubsystemRAII.h" #include "llvm/Testing/Support/Error.h" #include "gtest/gtest.h" #include <memory> @@ -77,8 +78,13 @@ class FakePlugin : public telemetry::TelemetryManager { using namespace lldb_private::telemetry; +class TelemetryTest : public testing::Test { + public: + SubsystemRAII<FakePlugin> subsystems; +}; + #if LLVM_ENABLE_TELEMETRY -#define TELEMETRY_TEST(suite, test) TEST(suite, test) +#define TELEMETRY_TEST(suite, test) TEST_F(suite, test) #else #define TELEMETRY_TEST(suite, test) TEST(DISABLED_##suite, test) #endif >From 96670f1bf7de08dc5606e3fdf51526fe759a9279 Mon Sep 17 00:00:00 2001 From: Vy Nguyen <v...@google.com> Date: Wed, 5 Mar 2025 14:52:55 -0500 Subject: [PATCH 2/3] format --- lldb/unittests/Core/TelemetryTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/unittests/Core/TelemetryTest.cpp b/lldb/unittests/Core/TelemetryTest.cpp index 5b762ae816362..c7edb0f92fde2 100644 --- a/lldb/unittests/Core/TelemetryTest.cpp +++ b/lldb/unittests/Core/TelemetryTest.cpp @@ -5,13 +5,13 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +#include "lldb/Core/Telemetry.h" +#include "TestingSupport/SubsystemRAII.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/Telemetry.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" #include "llvm/Telemetry/Telemetry.h" -#include "TestingSupport/SubsystemRAII.h" #include "llvm/Testing/Support/Error.h" #include "gtest/gtest.h" #include <memory> @@ -79,7 +79,7 @@ class FakePlugin : public telemetry::TelemetryManager { using namespace lldb_private::telemetry; class TelemetryTest : public testing::Test { - public: +public: SubsystemRAII<FakePlugin> subsystems; }; >From 6161c7fa06e5316ee29a48434af9db54270c762f Mon Sep 17 00:00:00 2001 From: Vy Nguyen <v...@google.com> Date: Wed, 5 Mar 2025 14:54:29 -0500 Subject: [PATCH 3/3] qual --- lldb/unittests/Core/TelemetryTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/unittests/Core/TelemetryTest.cpp b/lldb/unittests/Core/TelemetryTest.cpp index c7edb0f92fde2..2865a44654ee5 100644 --- a/lldb/unittests/Core/TelemetryTest.cpp +++ b/lldb/unittests/Core/TelemetryTest.cpp @@ -80,7 +80,7 @@ using namespace lldb_private::telemetry; class TelemetryTest : public testing::Test { public: - SubsystemRAII<FakePlugin> subsystems; + SubsystemRAII<lldb_private::FakePlugin> subsystems; }; #if LLVM_ENABLE_TELEMETRY _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
