From bc57761881e353cfc761454aed6d5f023883fc1e Mon Sep 17 00:00:00 2001 From: Gloop Team Date: Thu, 16 Jul 2026 11:51:55 -0700 Subject: [PATCH] Automated Code Change PiperOrigin-RevId: 949091005 --- gloop/base/BUILD | 1 + gloop/base/signal_util_subtle_test.cc | 25 ++++++++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/gloop/base/BUILD b/gloop/base/BUILD index 1344313e..e59d35b1 100644 --- a/gloop/base/BUILD +++ b/gloop/base/BUILD @@ -1513,6 +1513,7 @@ cc_test( ":percpu", ":signal_util_subtle", ":time_support", + "//gloop:gloop_test_main", "@abseil-cpp//absl/base:core_headers", "@abseil-cpp//absl/base:raw_logging_internal", "@abseil-cpp//absl/flags:flag", diff --git a/gloop/base/signal_util_subtle_test.cc b/gloop/base/signal_util_subtle_test.cc index 9214d0e6..9aaf761b 100644 --- a/gloop/base/signal_util_subtle_test.cc +++ b/gloop/base/signal_util_subtle_test.cc @@ -186,6 +186,14 @@ void sa_alrm(int sig) { class UtilInternalTest : public ::testing::Test { protected: static void SetUpTestSuite() { + // Add SIGALRM to blocked signals so that threads inherit and we can unblock + // on the main test thread. This avoids data races on variables shared + // between the test and the signal handler. + sigset_t blocked_signals; + CHECK_EQ(sigemptyset(&blocked_signals), 0); + CHECK_EQ(sigaddset(&blocked_signals, SIGALRM), 0); + CHECK_EQ(sigprocmask(SIG_BLOCK, &blocked_signals, nullptr), 0); + struct sigaction sig; // Set up signal handler @@ -588,20 +596,3 @@ TEST_F(UtilInternalTest, ScopedAffinityMask) { } } // namespace - -int main(int argc, char** argv) { - // Add SIGALRM to blocked signals so that threads inherit and we can unblock - // on the main test thread. This avoids data races on variables shared between - // the test and the signal handler. - sigset_t blocked_signals; - CHECK_EQ(sigemptyset(&blocked_signals), 0); - CHECK_EQ(sigaddset(&blocked_signals, SIGALRM), 0); - CHECK_EQ(sigprocmask(SIG_BLOCK, &blocked_signals, nullptr), 0); - // Init and run tests. - ::testing::InitGoogleTest(&argc, argv); - if (!benchmark::GetBenchmarkFilter().empty()) { - benchmark::RunSpecifiedBenchmarks(); - exit(0); - } - return RUN_ALL_TESTS(); -}