summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls/linux/shm.cc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
commit45a8edbd5ae6c836317923dc7d2b5baac9feea98 (patch)
treec8e011c89c1808fe2e520ee41c9bcb2af7911cd0 /test/syscalls/linux/shm.cc
parentb3405a719cbb33dac2deced192209a5584e5e3d6 (diff)
parent200cf245c4ed43d8e2a37484cdbc36f5fbfa1ac9 (diff)
Merge pull request #1492 from majek:err_typo_in_netstack_tests
PiperOrigin-RevId: 290840370
Diffstat (limited to 'test/syscalls/linux/shm.cc')
-rw-r--r--test/syscalls/linux/shm.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/syscalls/linux/shm.cc b/test/syscalls/linux/shm.cc
index 7ba752599..80700615f 100644
--- a/test/syscalls/linux/shm.cc
+++ b/test/syscalls/linux/shm.cc
@@ -30,7 +30,7 @@ namespace {
using ::testing::_;
-const uint64_t kAllocSize = kPageSize * 128ULL;
+const uint64 kAllocSize = kPageSize * 128ULL;
PosixErrorOr<char*> Shmat(int shmid, const void* shmaddr, int shmflg) {
const intptr_t addr =
@@ -320,11 +320,11 @@ TEST(ShmTest, RemovedSegmentsAreDestroyed) {
Shmget(IPC_PRIVATE, kAllocSize, IPC_CREAT | 0777));
const char* addr = ASSERT_NO_ERRNO_AND_VALUE(Shmat(shm.id(), nullptr, 0));
- const uint64_t alloc_pages = kAllocSize / kPageSize;
+ const uint64 alloc_pages = kAllocSize / kPageSize;
struct shm_info info;
ASSERT_NO_ERRNO(Shmctl(0 /*ignored*/, SHM_INFO, &info));
- const uint64_t before = info.shm_tot;
+ const uint64 before = info.shm_tot;
ASSERT_NO_ERRNO(shm.Rmid());
ASSERT_NO_ERRNO(Shmdt(addr));
@@ -400,7 +400,7 @@ TEST(ShmDeathTest, SegmentNotAccessibleAfterDetach) {
TEST(ShmTest, RequestingSegmentSmallerThanSHMMINFails) {
struct shminfo info;
ASSERT_NO_ERRNO(Shmctl(0, IPC_INFO, &info));
- const uint64_t size = info.shmmin - 1;
+ const uint64 size = info.shmmin - 1;
EXPECT_THAT(Shmget(IPC_PRIVATE, size, IPC_CREAT | 0777),
PosixErrorIs(EINVAL, _));
}
@@ -408,7 +408,7 @@ TEST(ShmTest, RequestingSegmentSmallerThanSHMMINFails) {
TEST(ShmTest, RequestingSegmentLargerThanSHMMAXFails) {
struct shminfo info;
ASSERT_NO_ERRNO(Shmctl(0, IPC_INFO, &info));
- const uint64_t size = info.shmmax + kPageSize;
+ const uint64 size = info.shmmax + kPageSize;
EXPECT_THAT(Shmget(IPC_PRIVATE, size, IPC_CREAT | 0777),
PosixErrorIs(EINVAL, _));
}