Cleanup lint messages

PiperOrigin-RevId: 379380041

1 files changed, 6 insertions, 3 deletions

diff --git a/test/syscalls/linux/prctl.cc b/test/syscalls/linux/prctl.cc
index 19a57d353..25b0e63d4 100644
--- a/test/syscalls/linux/prctl.cc
+++ b/test/syscalls/linux/prctl.cc
@@ -101,11 +101,11 @@ TEST(PrctlTest, NoNewPrivsPreservedAcrossCloneForkAndExecve) {
   int no_new_privs;
   ASSERT_THAT(no_new_privs = prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
               SyscallSucceeds());
-  ScopedThread([] {
+  ScopedThread thread = ScopedThread([] {
     ASSERT_THAT(prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0), SyscallSucceeds());
     EXPECT_THAT(prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
                 SyscallSucceedsWithValue(1));
-    ScopedThread([] {
+    ScopedThread threadInner = ScopedThread([] {
       EXPECT_THAT(prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
                   SyscallSucceedsWithValue(1));
       // Note that these ASSERT_*s failing will only return from this thread,
@@ -129,9 +129,11 @@ TEST(PrctlTest, NoNewPrivsPreservedAcrossCloneForkAndExecve) {
       EXPECT_THAT(prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
                   SyscallSucceedsWithValue(1));
     });
+    threadInner.Join();
     EXPECT_THAT(prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
                 SyscallSucceedsWithValue(1));
   });
+  thread.Join();
   EXPECT_THAT(prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0),
               SyscallSucceedsWithValue(no_new_privs));
 }
@@ -141,7 +143,7 @@ TEST(PrctlTest, PDeathSig) {
 
   // Make the new process' parent a separate thread since the parent death
   // signal fires when the parent *thread* exits.
-  ScopedThread([&] {
+  ScopedThread thread = ScopedThread([&] {
     child_pid = fork();
     TEST_CHECK(child_pid >= 0);
     if (child_pid == 0) {
@@ -172,6 +174,7 @@ TEST(PrctlTest, PDeathSig) {
     // Suppress the SIGSTOP and detach from the child.
     ASSERT_THAT(ptrace(PTRACE_DETACH, child_pid, 0, 0), SyscallSucceeds());
   });
+  thread.Join();
 
   // The child should have been killed by its parent death SIGKILL.
   int status;