Cleanup lint messages

PiperOrigin-RevId: 379380041

7 files changed, 34 insertions, 18 deletions

diff --git a/test/syscalls/linux/accept_bind.cc b/test/syscalls/linux/accept_bind.cc
index fe560cfc5..aa13e9f84 100644
--- a/test/syscalls/linux/accept_bind.cc
+++ b/test/syscalls/linux/accept_bind.cc
@@ -37,7 +37,8 @@ TEST_P(AllSocketPairTest, Listen) {
                    sockets->first_addr_size()),
               SyscallSucceeds());
 
-  ASSERT_THAT(listen(sockets->first_fd(), /* backlog = */ 5),
+  ASSERT_THAT(listen(sockets->first_fd(),
+                     /* backlog = */ 5),  // NOLINT(bugprone-argument-comment)
               SyscallSucceeds());
 }
 
diff --git a/test/syscalls/linux/poll.cc b/test/syscalls/linux/poll.cc
index 5ce7e8c8d..ccd084244 100644
--- a/test/syscalls/linux/poll.cc
+++ b/test/syscalls/linux/poll.cc
@@ -116,7 +116,7 @@ void BlockingReadableTest(int16_t mask) {
   });
 
   notify.WaitForNotification();
-  absl::SleepFor(absl::Seconds(1.0));
+  absl::SleepFor(absl::Seconds(1));
 
   // Write some data to the pipe.
   char s[] = "foo\n";
@@ -221,7 +221,7 @@ TEST_F(PollTest, BlockingEventPOLLHUP) {
   });
 
   notify.WaitForNotification();
-  absl::SleepFor(absl::Seconds(1.0));
+  absl::SleepFor(absl::Seconds(1));
 
   // Write some data and close the writer fd.
   fd1.reset();
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;
diff --git a/test/syscalls/linux/priority.cc b/test/syscalls/linux/priority.cc
index 1d9bdfa70..e381248e4 100644
--- a/test/syscalls/linux/priority.cc
+++ b/test/syscalls/linux/priority.cc
@@ -72,7 +72,8 @@ TEST(SetpriorityTest, Implemented) {
 
   // No need to clear errno for setpriority():
   // "The setpriority() call returns 0 if there is no error, or -1 if there is"
-  EXPECT_THAT(setpriority(PRIO_PROCESS, /*who=*/0, /*nice=*/16),
+  EXPECT_THAT(setpriority(PRIO_PROCESS, /*who=*/0,
+                          /*nice=*/16),  // NOLINT(bugprone-argument-comment)
               SyscallSucceeds());
 }
 
@@ -80,7 +81,8 @@ TEST(SetpriorityTest, Implemented) {
 TEST(Setpriority, InvalidWhich) {
   SKIP_IF(!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_SYS_NICE)));
 
-  EXPECT_THAT(setpriority(/*which=*/3, /*who=*/0, /*nice=*/16),
+  EXPECT_THAT(setpriority(/*which=*/3, /*who=*/0,
+                          /*nice=*/16),  // NOLINT(bugprone-argument-comment)
               SyscallFailsWithErrno(EINVAL));
 }
 
@@ -88,7 +90,8 @@ TEST(Setpriority, InvalidWhich) {
 TEST(SetpriorityTest, ValidWho) {
   SKIP_IF(!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_SYS_NICE)));
 
-  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(), /*nice=*/16),
+  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(),
+                          /*nice=*/16),  // NOLINT(bugprone-argument-comment)
               SyscallSucceeds());
 }
 
@@ -142,22 +145,26 @@ TEST(SetpriorityTest, OutsideRange) {
   SKIP_IF(!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_SYS_NICE)));
 
   // Set niceval > 19
-  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(), /*nice=*/100),
+  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(),
+                          /*nice=*/100),  // NOLINT(bugprone-argument-comment)
               SyscallSucceeds());
 
   errno = 0;
   // Test niceval truncated to 19
   EXPECT_THAT(getpriority(PRIO_PROCESS, getpid()),
-              SyscallSucceedsWithValue(/*maxnice=*/19));
+              SyscallSucceedsWithValue(
+                  /*maxnice=*/19));  // NOLINT(bugprone-argument-comment)
 
   // Set niceval < -20
-  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(), /*nice=*/-100),
+  EXPECT_THAT(setpriority(PRIO_PROCESS, getpid(),
+                          /*nice=*/-100),  // NOLINT(bugprone-argument-comment)
               SyscallSucceeds());
 
   errno = 0;
   // Test niceval truncated to -20
   EXPECT_THAT(getpriority(PRIO_PROCESS, getpid()),
-              SyscallSucceedsWithValue(/*minnice=*/-20));
+              SyscallSucceedsWithValue(
+                  /*minnice=*/-20));  // NOLINT(bugprone-argument-comment)
 }
 
 // Process is not found when which=PRIO_PROCESS
@@ -167,7 +174,7 @@ TEST(SetpriorityTest, InvalidWho) {
   // Flaky, but it's tough to avoid a race condition when finding an unused pid
   EXPECT_THAT(setpriority(PRIO_PROCESS,
                           /*who=*/INT_MAX - 1,
-                          /*nice=*/16),
+                          /*nice=*/16),  // NOLINT(bugprone-argument-comment)
               SyscallFailsWithErrno(ESRCH));
 }
 
diff --git a/test/syscalls/linux/socket_test_util.cc b/test/syscalls/linux/socket_test_util.cc
index 6039b2a67..83c33ec8d 100644
--- a/test/syscalls/linux/socket_test_util.cc
+++ b/test/syscalls/linux/socket_test_util.cc
@@ -85,7 +85,8 @@ Creator<SocketPair> AcceptBindSocketPairCreator(bool abstract, int domain,
     RETURN_ERROR_IF_SYSCALL_FAIL(
         bind(bound, AsSockAddr(&bind_addr), sizeof(bind_addr)));
     MaybeSave();  // Successful bind.
-    RETURN_ERROR_IF_SYSCALL_FAIL(listen(bound, /* backlog = */ 5));
+    RETURN_ERROR_IF_SYSCALL_FAIL(
+        listen(bound, /* backlog = */ 5));  // NOLINT(bugprone-argument-comment)
     MaybeSave();  // Successful listen.
 
     int connected;
@@ -316,7 +317,8 @@ PosixErrorOr<T> BindIP(int fd, bool dual_stack) {
 template <typename T>
 PosixErrorOr<T> TCPBindAndListen(int fd, bool dual_stack) {
   ASSIGN_OR_RETURN_ERRNO(T addr, BindIP<T>(fd, dual_stack));
-  RETURN_ERROR_IF_SYSCALL_FAIL(listen(fd, /* backlog = */ 5));
+  RETURN_ERROR_IF_SYSCALL_FAIL(
+      listen(fd, /* backlog = */ 5));  // NOLINT(bugprone-argument-comment)
   return addr;
 }
 
diff --git a/test/syscalls/linux/uidgid.cc b/test/syscalls/linux/uidgid.cc
index 4139a18d8..d95a3e010 100644
--- a/test/syscalls/linux/uidgid.cc
+++ b/test/syscalls/linux/uidgid.cc
@@ -170,7 +170,9 @@ TEST(UidGidRootTest, SetgidNotFromThreadGroupLeader) {
   const gid_t gid = absl::GetFlag(FLAGS_scratch_gid1);
   // NOTE(b/64676707): Do setgid in a separate thread so that we can test if
   // info.si_pid is set correctly.
-  ScopedThread([gid] { ASSERT_THAT(setgid(gid), SyscallSucceeds()); });
+  ScopedThread thread =
+      ScopedThread([gid] { ASSERT_THAT(setgid(gid), SyscallSucceeds()); });
+  thread.Join();
   EXPECT_NO_ERRNO(CheckGIDs(gid, gid, gid));
 
 #pragma pop_macro("allow_setgid")
diff --git a/test/syscalls/linux/uname.cc b/test/syscalls/linux/uname.cc
index 759ea4f53..c52abef5c 100644
--- a/test/syscalls/linux/uname.cc
+++ b/test/syscalls/linux/uname.cc
@@ -88,7 +88,7 @@ TEST(UnameTest, UnshareUTS) {
   struct utsname init;
   ASSERT_THAT(uname(&init), SyscallSucceeds());
 
-  ScopedThread([&]() {
+  ScopedThread thread = ScopedThread([&]() {
     EXPECT_THAT(unshare(CLONE_NEWUTS), SyscallSucceeds());
 
     constexpr char kHostname[] = "wubbalubba";
@@ -97,6 +97,7 @@ TEST(UnameTest, UnshareUTS) {
     char hostname[65];
     EXPECT_THAT(gethostname(hostname, sizeof(hostname)), SyscallSucceeds());
   });
+  thread.Join();
 
   struct utsname after;
   EXPECT_THAT(uname(&after), SyscallSucceeds());