Skip to content

Commit 6f38713

Browse files
[libc] Fix failing mktime test case in 32-bit systems (#65390)
Previously, these tests expected that calling mktime with a struct tm that caused overlow to succeed with return -1 (TimeConstants::OUT_OF_RANGE_RETURN_VALUE), however, the Succeeds call expects the errno to be zero (no failure). This patch fixes the expected calls to fail with EOVERFLOW. These tests are only enabled to 32-bit systems, and are probably not being tested on the arm32 buildbot, that's why this was not a problem before.
1 parent 10fb71b commit 6f38713

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

libc/test/src/time/mktime_test.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
187187
.tm_mon = Month::JANUARY, .tm_year = tm_year(2038), .tm_wday = 0,
188188
.tm_yday = 0
189189
};
190-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
191-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
190+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
192191
}
193192

194193
{
@@ -198,8 +197,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
198197
.tm_mon = Month::JANUARY, .tm_year = tm_year(2038), .tm_wday = 0,
199198
.tm_yday = 0
200199
};
201-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
202-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
200+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
203201
}
204202

205203
{
@@ -209,8 +207,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
209207
.tm_mon = Month::JANUARY, .tm_year = tm_year(2038), .tm_wday = 0,
210208
.tm_yday = 0
211209
};
212-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
213-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
210+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
214211
}
215212

216213
{
@@ -220,8 +217,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
220217
.tm_mon = Month::JANUARY, .tm_year = tm_year(2038), .tm_wday = 0,
221218
.tm_yday = 0
222219
};
223-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
224-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
220+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
225221
}
226222

227223
{
@@ -231,8 +227,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
231227
.tm_mon = Month::FEBRUARY, .tm_year = tm_year(2038), .tm_wday = 0,
232228
.tm_yday = 0
233229
};
234-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
235-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
230+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
236231
}
237232

238233
{
@@ -242,8 +237,7 @@ TEST(LlvmLibcMkTime, InvalidEndOf32BitEpochYear) {
242237
.tm_mon = Month::JANUARY, .tm_year = tm_year(2039), .tm_wday = 0,
243238
.tm_yday = 0
244239
};
245-
EXPECT_THAT(__llvm_libc::mktime(&tm_data),
246-
Succeeds(TimeConstants::OUT_OF_RANGE_RETURN_VALUE));
240+
EXPECT_THAT(__llvm_libc::mktime(&tm_data), Fails(EOVERFLOW));
247241
}
248242
}
249243

0 commit comments

Comments
 (0)