upstream: Fix long->int for convtime tests here too. Spotted by
tobhe@. OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0
This commit is contained in:
parent
b55b7565f1
commit
6ffdcdda12
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: tests.c,v 1.2 2019/06/14 04:03:48 djm Exp $ */
|
||||
/* $OpenBSD: tests.c,v 1.3 2021/01/18 11:43:34 dtucker Exp $ */
|
||||
/*
|
||||
* Regress test for conversions
|
||||
*
|
||||
|
@ -26,28 +26,28 @@ tests(void)
|
|||
char buf[1024];
|
||||
|
||||
TEST_START("conversion_convtime");
|
||||
ASSERT_LONG_EQ(convtime("0"), 0);
|
||||
ASSERT_LONG_EQ(convtime("1"), 1);
|
||||
ASSERT_LONG_EQ(convtime("1S"), 1);
|
||||
ASSERT_INT_EQ(convtime("0"), 0);
|
||||
ASSERT_INT_EQ(convtime("1"), 1);
|
||||
ASSERT_INT_EQ(convtime("1S"), 1);
|
||||
/* from the examples in the comment above the function */
|
||||
ASSERT_LONG_EQ(convtime("90m"), 5400);
|
||||
ASSERT_LONG_EQ(convtime("1h30m"), 5400);
|
||||
ASSERT_LONG_EQ(convtime("2d"), 172800);
|
||||
ASSERT_LONG_EQ(convtime("1w"), 604800);
|
||||
ASSERT_INT_EQ(convtime("90m"), 5400);
|
||||
ASSERT_INT_EQ(convtime("1h30m"), 5400);
|
||||
ASSERT_INT_EQ(convtime("2d"), 172800);
|
||||
ASSERT_INT_EQ(convtime("1w"), 604800);
|
||||
|
||||
/* negative time is not allowed */
|
||||
ASSERT_LONG_EQ(convtime("-7"), -1);
|
||||
ASSERT_LONG_EQ(convtime("-9d"), -1);
|
||||
ASSERT_INT_EQ(convtime("-7"), -1);
|
||||
ASSERT_INT_EQ(convtime("-9d"), -1);
|
||||
|
||||
/* overflow */
|
||||
snprintf(buf, sizeof buf, "%llu", (unsigned long long)LONG_MAX);
|
||||
ASSERT_LONG_EQ(convtime(buf), -1);
|
||||
snprintf(buf, sizeof buf, "%llu", (unsigned long long)LONG_MAX + 1);
|
||||
ASSERT_LONG_EQ(convtime(buf), -1);
|
||||
snprintf(buf, sizeof buf, "%llu", (unsigned long long)INT_MAX);
|
||||
ASSERT_INT_EQ(convtime(buf), INT_MAX);
|
||||
snprintf(buf, sizeof buf, "%llu", (unsigned long long)INT_MAX + 1);
|
||||
ASSERT_INT_EQ(convtime(buf), -1);
|
||||
|
||||
/* overflow with multiplier */
|
||||
snprintf(buf, sizeof buf, "%lluM", (unsigned long long)LONG_MAX/60 + 1);
|
||||
ASSERT_LONG_EQ(convtime(buf), -1);
|
||||
ASSERT_LONG_EQ(convtime("1000000000000000000000w"), -1);
|
||||
snprintf(buf, sizeof buf, "%lluM", (unsigned long long)INT_MAX/60 + 1);
|
||||
ASSERT_INT_EQ(convtime(buf), -1);
|
||||
ASSERT_INT_EQ(convtime("1000000000000000000000w"), -1);
|
||||
TEST_DONE();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue