From e289c5d8a1c66424386d2ca8c788f6778420620c Mon Sep 17 00:00:00 2001 From: Roger Zanoni Date: Tue, 28 Jul 2026 19:18:51 -0300 Subject: [PATCH] Cherry pick PR #11335: nplb: use SIGUSR2 in KillSendsSignalToSelf Refer to original PR: #11335 SIGUSR1 is intercepted by the Android runtime and never reaches the handler installed by the test. Switch the test to SIGUSR2. Bug: 532068409 (cherry picked from commit b6c1a9d4a05d8abb211b1e65088f10a93b4dd17e) --- .github/AUTOROLL | 2 +- starboard/nplb/posix_compliance/posix_signal_test.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/AUTOROLL b/.github/AUTOROLL index 49c9e21e9eb7..e60c91271fb1 100644 --- a/.github/AUTOROLL +++ b/.github/AUTOROLL @@ -1 +1 @@ -00d5d7bd741b67377b635a199fb366a14cdce7c3 +b6c1a9d4a05d8abb211b1e65088f10a93b4dd17e diff --git a/starboard/nplb/posix_compliance/posix_signal_test.cc b/starboard/nplb/posix_compliance/posix_signal_test.cc index 78d92bbdc123..d37267e374f9 100644 --- a/starboard/nplb/posix_compliance/posix_signal_test.cc +++ b/starboard/nplb/posix_compliance/posix_signal_test.cc @@ -236,13 +236,13 @@ TEST_F(PosixSignalTest, KillSendsSignalToSelf) { struct sigaction sa = {}; sa.sa_handler = PipeWritingSignalHandler; sigemptyset(&sa.sa_mask); - ASSERT_EQ(sigaction(SIGUSR1, &sa, nullptr), 0); + ASSERT_EQ(sigaction(SIGUSR2, &sa, nullptr), 0); - ASSERT_EQ(kill(getpid(), SIGUSR1), 0); + ASSERT_EQ(kill(getpid(), SIGUSR2), 0); int received_signal = 0; EXPECT_TRUE(WaitForSignalWithTimeout(&received_signal, 1000)); - EXPECT_EQ(received_signal, SIGUSR1); + EXPECT_EQ(received_signal, SIGUSR2); } TEST_F(PosixSignalTest, PauseIsInterruptedBySignal) {