3 files changed, 18 insertions, 13 deletions

diff --git a/test/syscalls/linux/madvise.cc b/test/syscalls/linux/madvise.cc
index 5a1973f60..6e714b12c 100644
--- a/test/syscalls/linux/madvise.cc
+++ b/test/syscalls/linux/madvise.cc
@@ -179,9 +179,9 @@ TEST(MadviseDontforkTest, DontforkShared) {
     // First page is mapped in child and modifications are visible to parent
     // via the shared mapping.
     TEST_CHECK(IsMapped(ms1.addr()));
-    ExpectAllMappingBytes(ms1, 2);
+    CheckAllMappingBytes(ms1, 2);
     memset(ms1.ptr(), 1, kPageSize);
-    ExpectAllMappingBytes(ms1, 1);
+    CheckAllMappingBytes(ms1, 1);
 
     // Second page must not be mapped in child.
     TEST_CHECK(!IsMapped(ms2.addr()));
@@ -222,9 +222,9 @@ TEST(MadviseDontforkTest, DontforkAnonPrivate) {
     // page. The mapping is private so the modifications are not visible to
     // the parent.
     TEST_CHECK(IsMapped(mp1.addr()));
-    ExpectAllMappingBytes(mp1, 1);
+    CheckAllMappingBytes(mp1, 1);
     memset(mp1.ptr(), 11, kPageSize);
-    ExpectAllMappingBytes(mp1, 11);
+    CheckAllMappingBytes(mp1, 11);
 
     // Verify second page is not mapped.
     TEST_CHECK(!IsMapped(mp2.addr()));
@@ -233,9 +233,9 @@ TEST(MadviseDontforkTest, DontforkAnonPrivate) {
     // page. The mapping is private so the modifications are not visible to
     // the parent.
     TEST_CHECK(IsMapped(mp3.addr()));
-    ExpectAllMappingBytes(mp3, 3);
+    CheckAllMappingBytes(mp3, 3);
     memset(mp3.ptr(), 13, kPageSize);
-    ExpectAllMappingBytes(mp3, 13);
+    CheckAllMappingBytes(mp3, 13);
   };
   EXPECT_THAT(InForkedProcess(rest), IsPosixErrorOkAndHolds(0));
 
diff --git a/test/syscalls/linux/pty.cc b/test/syscalls/linux/pty.cc
index 0b174e2be..85ff258df 100644
--- a/test/syscalls/linux/pty.cc
+++ b/test/syscalls/linux/pty.cc
@@ -1338,6 +1338,7 @@ TEST_F(JobControlTest, SetTTYDifferentSession) {
     TEST_PCHECK(waitpid(grandchild, &gcwstatus, 0) == grandchild);
     TEST_PCHECK(gcwstatus == 0);
   });
+  ASSERT_NO_ERRNO(res);
 }
 
 TEST_F(JobControlTest, ReleaseTTY) {
@@ -1515,7 +1516,8 @@ TEST_F(JobControlTest, GetForegroundProcessGroupNonControlling) {
 // - creates a child process in a new process group
 // - sets that child as the foreground process group
 // - kills its child and sets itself as the foreground process group.
-TEST_F(JobControlTest, SetForegroundProcessGroup) {
+// TODO(gvisor.dev/issue/5357): Fix and enable.
+TEST_F(JobControlTest, DISABLED_SetForegroundProcessGroup) {
   auto res = RunInChild([=]() {
     TEST_PCHECK(!ioctl(replica_.get(), TIOCSCTTY, 0));
 
@@ -1557,6 +1559,7 @@ TEST_F(JobControlTest, SetForegroundProcessGroup) {
     TEST_PCHECK(pgid = getpgid(0) == 0);
     TEST_PCHECK(!tcsetpgrp(replica_.get(), pgid));
   });
+  ASSERT_NO_ERRNO(res);
 }
 
 TEST_F(JobControlTest, SetForegroundProcessGroupWrongTTY) {
@@ -1576,8 +1579,9 @@ TEST_F(JobControlTest, SetForegroundProcessGroupNegPgid) {
   ASSERT_NO_ERRNO(ret);
 }
 
-TEST_F(JobControlTest, SetForegroundProcessGroupEmptyProcessGroup) {
-  auto ret = RunInChild([=]() {
+// TODO(gvisor.dev/issue/5357): Fix and enable.
+TEST_F(JobControlTest, DISABLED_SetForegroundProcessGroupEmptyProcessGroup) {
+  auto res = RunInChild([=]() {
     TEST_PCHECK(!ioctl(replica_.get(), TIOCSCTTY, 0));
 
     // Create a new process, put it in a new process group, make that group the
@@ -1595,6 +1599,7 @@ TEST_F(JobControlTest, SetForegroundProcessGroupEmptyProcessGroup) {
     TEST_PCHECK(ioctl(replica_.get(), TIOCSPGRP, &grandchild) != 0 &&
                 errno == ESRCH);
   });
+  ASSERT_NO_ERRNO(res);
 }
 
 TEST_F(JobControlTest, SetForegroundProcessGroupDifferentSession) {
diff --git a/test/syscalls/linux/shm.cc b/test/syscalls/linux/shm.cc
index 6aabd79e7..baf794152 100644
--- a/test/syscalls/linux/shm.cc
+++ b/test/syscalls/linux/shm.cc
@@ -372,18 +372,18 @@ TEST(ShmDeathTest, SegmentNotAccessibleAfterDetach) {
   SetupGvisorDeathTest();
 
   const auto rest = [&] {
-    ShmSegment shm = ASSERT_NO_ERRNO_AND_VALUE(
+    ShmSegment shm = TEST_CHECK_NO_ERRNO_AND_VALUE(
         Shmget(IPC_PRIVATE, kAllocSize, IPC_CREAT | 0777));
-    char* addr = ASSERT_NO_ERRNO_AND_VALUE(Shmat(shm.id(), nullptr, 0));
+    char* addr = TEST_CHECK_NO_ERRNO_AND_VALUE(Shmat(shm.id(), nullptr, 0));
 
     // Mark the segment as destroyed so it's automatically cleaned up when we
     // crash below. We can't rely on the standard cleanup since the destructor
     // will not run after the SIGSEGV. Note that this doesn't destroy the
     // segment immediately since we're still attached to it.
-    ASSERT_NO_ERRNO(shm.Rmid());
+    TEST_CHECK_NO_ERRNO(shm.Rmid());
 
     addr[0] = 'x';
-    ASSERT_NO_ERRNO(Shmdt(addr));
+    TEST_CHECK_NO_ERRNO(Shmdt(addr));
 
     // This access should cause a SIGSEGV.
     addr[0] = 'x';