Skip to content

Commit 07a6709

Browse files
lntuelntue
committed
Revert test changes.
1 parent 1ee30a9 commit 07a6709

File tree

12 files changed

+72
-74
lines changed

12 files changed

+72
-74
lines changed

‎libc/test/src/math/smoke/nan_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST_F(LlvmLibcNanTest, RandomString) {
4444
}
4545

4646
#if !defined(LIBC_HAVE_ADDRESS_SANITIZER) && defined(LIBC_TARGET_OS_IS_LINUX)
47-
// TEST_F(LlvmLibcNanTest, InvalidInput) {
48-
// EXPECT_DEATH([] { LIBC_NAMESPACE::nan(nullptr); }, WITH_SIGNAL(SIGSEGV));
49-
// }
47+
TEST_F(LlvmLibcNanTest, InvalidInput) {
48+
EXPECT_DEATH([] { LIBC_NAMESPACE::nan(nullptr); }, WITH_SIGNAL(SIGSEGV));
49+
}
5050
#endif // LIBC_HAVE_ADDRESS_SANITIZER

‎libc/test/src/math/smoke/nanf128_test.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ TEST_F(LlvmLibcNanf128Test, RandomString) {
5454
}
5555

5656
#if !defined(LIBC_HAVE_ADDRESS_SANITIZER) && defined(LIBC_TARGET_OS_IS_LINUX)
57-
// #include <signal.h>
58-
// TEST_F(LlvmLibcNanf128Test, InvalidInput) {
59-
// EXPECT_DEATH([] { LIBC_NAMESPACE::nanf128(nullptr); },
60-
// WITH_SIGNAL(SIGSEGV));
61-
// }
57+
#include <signal.h>
58+
TEST_F(LlvmLibcNanf128Test, InvalidInput) {
59+
EXPECT_DEATH([] { LIBC_NAMESPACE::nanf128(nullptr); }, WITH_SIGNAL(SIGSEGV));
60+
}
6261
#endif // LIBC_HAVE_ADDRESS_SANITIZER

‎libc/test/src/math/smoke/nanf16_test.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ TEST_F(LlvmLibcNanf16Test, RandomString) {
4545
}
4646

4747
#if !defined(LIBC_HAVE_ADDRESS_SANITIZER) && defined(LIBC_TARGET_OS_IS_LINUX)
48-
// TEST_F(LlvmLibcNanf16Test, InvalidInput) {
49-
// EXPECT_DEATH([] { LIBC_NAMESPACE::nanf16(nullptr); },
50-
// WITH_SIGNAL(SIGSEGV));
51-
// }
48+
TEST_F(LlvmLibcNanf16Test, InvalidInput) {
49+
EXPECT_DEATH([] { LIBC_NAMESPACE::nanf16(nullptr); }, WITH_SIGNAL(SIGSEGV));
50+
}
5251
#endif // LIBC_HAVE_ADDRESS_SANITIZER

‎libc/test/src/math/smoke/nanl_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ TEST_F(LlvmLibcNanlTest, RandomString) {
7171
}
7272

7373
#if !defined(LIBC_HAVE_ADDRESS_SANITIZER) && defined(LIBC_TARGET_OS_IS_LINUX)
74-
// TEST_F(LlvmLibcNanlTest, InvalidInput) {
75-
// EXPECT_DEATH([] { LIBC_NAMESPACE::nanl(nullptr); }, WITH_SIGNAL(SIGSEGV));
76-
// }
74+
TEST_F(LlvmLibcNanlTest, InvalidInput) {
75+
EXPECT_DEATH([] { LIBC_NAMESPACE::nanl(nullptr); }, WITH_SIGNAL(SIGSEGV));
76+
}
7777
#endif // LIBC_HAVE_ADDRESS_SANITIZER

‎libc/test/src/sys/mman/linux/madvise_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ TEST(LlvmLibcMadviseTest, NoError) {
3939

4040
TEST(LlvmLibcMadviseTest, Error_BadPtr) {
4141
LIBC_NAMESPACE::libc_errno = 0;
42-
// EXPECT_THAT(LIBC_NAMESPACE::madvise(nullptr, 8, MADV_SEQUENTIAL),
43-
// Fails(ENOMEM));
42+
EXPECT_THAT(LIBC_NAMESPACE::madvise(nullptr, 8, MADV_SEQUENTIAL),
43+
Fails(ENOMEM));
4444
}

‎libc/test/src/sys/mman/linux/mincore_test.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ TEST(LlvmLibcMincoreTest, UnalignedAddr) {
4040
EXPECT_NE(addr, MAP_FAILED);
4141
EXPECT_EQ(reinterpret_cast<unsigned long>(addr) % page_size, 0ul);
4242
LIBC_NAMESPACE::libc_errno = 0;
43-
// int res = LIBC_NAMESPACE::mincore(static_cast<char *>(addr) + 1, 1, nullptr);
44-
// EXPECT_THAT(res, Fails(EINVAL, -1));
43+
int res = LIBC_NAMESPACE::mincore(static_cast<char *>(addr) + 1, 1, nullptr);
44+
EXPECT_THAT(res, Fails(EINVAL, -1));
4545
EXPECT_THAT(LIBC_NAMESPACE::munmap(addr, page_size), Succeeds());
4646
}
4747

@@ -107,9 +107,9 @@ TEST(LlvmLibcMincoreTest, PageOut) {
107107
Succeeds());
108108

109109
LIBC_NAMESPACE::libc_errno = 0;
110-
// int res = LIBC_NAMESPACE::mincore(addr, page_size, &vec);
111-
// EXPECT_EQ(vec & 1u, 0u);
112-
// EXPECT_THAT(res, Succeeds());
110+
int res = LIBC_NAMESPACE::mincore(addr, page_size, &vec);
111+
EXPECT_EQ(vec & 1u, 0u);
112+
EXPECT_THAT(res, Succeeds());
113113
}
114114

115115
EXPECT_THAT(LIBC_NAMESPACE::munmap(addr, page_size), Succeeds());

‎libc/test/src/sys/mman/linux/mlock_test.cpp

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ static bool is_permitted_size(size_t size) {
7676
}
7777

7878
TEST(LlvmLibcMlockTest, UnMappedMemory) {
79-
// EXPECT_THAT(LIBC_NAMESPACE::mlock(nullptr, 1024), Fails(ENOMEM));
80-
// EXPECT_THAT(LIBC_NAMESPACE::munlock(nullptr, 1024), Fails(ENOMEM));
79+
EXPECT_THAT(LIBC_NAMESPACE::mlock(nullptr, 1024), Fails(ENOMEM));
80+
EXPECT_THAT(LIBC_NAMESPACE::munlock(nullptr, 1024), Fails(ENOMEM));
8181
}
8282

8383
TEST(LlvmLibcMlockTest, Overflow) {
@@ -93,53 +93,53 @@ TEST(LlvmLibcMlockTest, Overflow) {
9393

9494
#ifdef SYS_mlock2
9595
TEST(LlvmLibcMlockTest, MLock2) {
96-
// PageHolder holder;
97-
// EXPECT_TRUE(holder.is_valid());
98-
// EXPECT_THAT(LIBC_NAMESPACE::madvise(holder.addr, holder.size, MADV_DONTNEED),
99-
// Succeeds());
100-
// EXPECT_THAT(LIBC_NAMESPACE::mlock2(holder.addr, holder.size, 0), Succeeds());
101-
// unsigned char vec;
102-
// EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
103-
// Succeeds());
104-
// EXPECT_EQ(vec & 1, 1);
105-
// EXPECT_THAT(LIBC_NAMESPACE::munlock(holder.addr, holder.size), Succeeds());
106-
// EXPECT_THAT(LIBC_NAMESPACE::madvise(holder.addr, holder.size, MADV_DONTNEED),
107-
// Succeeds());
108-
// EXPECT_THAT(LIBC_NAMESPACE::mlock2(holder.addr, holder.size, MLOCK_ONFAULT),
109-
// Succeeds());
110-
// EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
111-
// Succeeds());
112-
// EXPECT_EQ(vec & 1, 0);
113-
// holder[0] = 1;
114-
// EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
115-
// Succeeds());
116-
// EXPECT_EQ(vec & 1, 1);
117-
// EXPECT_THAT(LIBC_NAMESPACE::munlock(holder.addr, holder.size), Succeeds());
96+
PageHolder holder;
97+
EXPECT_TRUE(holder.is_valid());
98+
EXPECT_THAT(LIBC_NAMESPACE::madvise(holder.addr, holder.size, MADV_DONTNEED),
99+
Succeeds());
100+
EXPECT_THAT(LIBC_NAMESPACE::mlock2(holder.addr, holder.size, 0), Succeeds());
101+
unsigned char vec;
102+
EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
103+
Succeeds());
104+
EXPECT_EQ(vec & 1, 1);
105+
EXPECT_THAT(LIBC_NAMESPACE::munlock(holder.addr, holder.size), Succeeds());
106+
EXPECT_THAT(LIBC_NAMESPACE::madvise(holder.addr, holder.size, MADV_DONTNEED),
107+
Succeeds());
108+
EXPECT_THAT(LIBC_NAMESPACE::mlock2(holder.addr, holder.size, MLOCK_ONFAULT),
109+
Succeeds());
110+
EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
111+
Succeeds());
112+
EXPECT_EQ(vec & 1, 0);
113+
holder[0] = 1;
114+
EXPECT_THAT(LIBC_NAMESPACE::mincore(holder.addr, holder.size, &vec),
115+
Succeeds());
116+
EXPECT_EQ(vec & 1, 1);
117+
EXPECT_THAT(LIBC_NAMESPACE::munlock(holder.addr, holder.size), Succeeds());
118118
}
119119
#endif
120120

121121
TEST(LlvmLibcMlockTest, InvalidFlag) {
122-
// size_t alloc_size = 128; // page size
123-
// LIBC_NAMESPACE::libc_errno = 0;
124-
// void *addr = LIBC_NAMESPACE::mmap(nullptr, alloc_size, PROT_READ,
125-
// MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
126-
// ASSERT_ERRNO_SUCCESS();
127-
// EXPECT_NE(addr, MAP_FAILED);
128-
129-
// // Invalid mlock2 flags.
130-
// EXPECT_THAT(LIBC_NAMESPACE::mlock2(addr, alloc_size, 1234), Fails(EINVAL));
131-
132-
// // Invalid mlockall flags.
133-
// EXPECT_THAT(LIBC_NAMESPACE::mlockall(1234), Fails(EINVAL));
134-
135-
// // man 2 mlockall says EINVAL is a valid return code when MCL_ONFAULT was
136-
// // specified without MCL_FUTURE or MCL_CURRENT, but this seems to fail on
137-
// // Linux 4.19.y (EOL).
138-
// // TODO(ndesaulniers) re-enable after
139-
// // https://github.com/llvm/llvm-project/issues/80073 is fixed.
140-
// // EXPECT_THAT(LIBC_NAMESPACE::mlockall(MCL_ONFAULT), Fails(EINVAL));
141-
142-
// LIBC_NAMESPACE::munmap(addr, alloc_size);
122+
size_t alloc_size = 128; // page size
123+
LIBC_NAMESPACE::libc_errno = 0;
124+
void *addr = LIBC_NAMESPACE::mmap(nullptr, alloc_size, PROT_READ,
125+
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
126+
ASSERT_ERRNO_SUCCESS();
127+
EXPECT_NE(addr, MAP_FAILED);
128+
129+
// Invalid mlock2 flags.
130+
EXPECT_THAT(LIBC_NAMESPACE::mlock2(addr, alloc_size, 1234), Fails(EINVAL));
131+
132+
// Invalid mlockall flags.
133+
EXPECT_THAT(LIBC_NAMESPACE::mlockall(1234), Fails(EINVAL));
134+
135+
// man 2 mlockall says EINVAL is a valid return code when MCL_ONFAULT was
136+
// specified without MCL_FUTURE or MCL_CURRENT, but this seems to fail on
137+
// Linux 4.19.y (EOL).
138+
// TODO(ndesaulniers) re-enable after
139+
// https://github.com/llvm/llvm-project/issues/80073 is fixed.
140+
// EXPECT_THAT(LIBC_NAMESPACE::mlockall(MCL_ONFAULT), Fails(EINVAL));
141+
142+
LIBC_NAMESPACE::munmap(addr, alloc_size);
143143
}
144144

145145
TEST(LlvmLibcMlockTest, MLockAll) {

‎libc/test/src/sys/mman/linux/msync_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ struct PageHolder {
3838
};
3939

4040
TEST(LlvmLibcMsyncTest, UnMappedMemory) {
41-
// EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_SYNC), Fails(ENOMEM));
42-
// EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_ASYNC), Fails(ENOMEM));
41+
EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_SYNC), Fails(ENOMEM));
42+
EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_ASYNC), Fails(ENOMEM));
4343
}
4444

4545
TEST(LlvmLibcMsyncTest, LockedPage) {

‎libc/test/src/sys/mman/linux/posix_madvise_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ TEST(LlvmLibcPosixMadviseTest, Error_BadPtr) {
4545

4646
// posix_madvise doesn't set errno, but the return value is actually the error
4747
// code.
48-
// EXPECT_EQ(LIBC_NAMESPACE::posix_madvise(nullptr, 8, POSIX_MADV_SEQUENTIAL),
49-
// ENOMEM);
48+
EXPECT_EQ(LIBC_NAMESPACE::posix_madvise(nullptr, 8, POSIX_MADV_SEQUENTIAL),
49+
ENOMEM);
5050
}

‎libc/test/src/termios/termios_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ TEST(LlvmLibcTermiosTest, TcGetSidSmokeTest) {
5959
if (fd < 0)
6060
return; // When /dev/tty is not available, no point continuing.
6161
ASSERT_ERRNO_SUCCESS();
62-
// ASSERT_GT(LIBC_NAMESPACE::tcgetsid(fd), pid_t(0));
62+
ASSERT_GT(LIBC_NAMESPACE::tcgetsid(fd), pid_t(0));
6363
ASSERT_EQ(LIBC_NAMESPACE::close(fd), 0);
6464
}

‎libc/test/src/unistd/pread_pwrite_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ TEST(LlvmLibcUniStd, PWriteFails) {
7272

7373
TEST(LlvmLibcUniStd, PReadFails) {
7474
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
75-
// EXPECT_THAT(LIBC_NAMESPACE::pread(-1, nullptr, 1, 0), Fails(EBADF));
75+
EXPECT_THAT(LIBC_NAMESPACE::pread(-1, nullptr, 1, 0), Fails(EBADF));
7676
}

‎libc/test/src/unistd/read_write_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TEST(LlvmLibcUniStd, WriteFails) {
5656
TEST(LlvmLibcUniStd, ReadFails) {
5757
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
5858

59-
// EXPECT_THAT(LIBC_NAMESPACE::read(-1, nullptr, 1), Fails(EBADF));
59+
EXPECT_THAT(LIBC_NAMESPACE::read(-1, nullptr, 1), Fails(EBADF));
6060
EXPECT_THAT(LIBC_NAMESPACE::read(0, reinterpret_cast<void *>(-1), 1),
6161
Fails(EFAULT));
6262
}

0 commit comments

Comments
 (0)