mirror of
https://github.com/jemalloc/jemalloc.git
synced 2026-07-23 21:23:06 +00:00
Change assert_* to expect_* in tests
```
grep -Irl assert_ test/ | xargs sed -i \
's/witness_assert/witness_do_not_replace/g';
grep -Irl assert_ test/ | xargs sed -i \
's/malloc_mutex_assert_owner/malloc_mutex_do_not_replace_owner/g';
grep -Ir assert_ test/ | grep -o "[_a-zA-Z]*assert_[_a-zA-Z]*" | \
grep -v "^assert_"; # confirm no output
grep -Irl assert_ test/ | xargs sed -i 's/assert_/expect_/g';
grep -Irl witness_do_not_replace test/ | xargs sed -i \
's/witness_do_not_replace/witness_assert/g';
grep -Irl malloc_mutex_do_not_replace_owner test/ | xargs sed -i \
's/malloc_mutex_do_not_replace_owner/malloc_mutex_assert_owner/g';
```
This commit is contained in:
@@ -6,27 +6,27 @@
|
||||
unsigned i, pow2; \
|
||||
t x; \
|
||||
\
|
||||
assert_##suf##_eq(pow2_ceil_##suf(0), 0, "Unexpected result"); \
|
||||
expect_##suf##_eq(pow2_ceil_##suf(0), 0, "Unexpected result"); \
|
||||
\
|
||||
for (i = 0; i < sizeof(t) * 8; i++) { \
|
||||
assert_##suf##_eq(pow2_ceil_##suf(((t)1) << i), ((t)1) \
|
||||
expect_##suf##_eq(pow2_ceil_##suf(((t)1) << i), ((t)1) \
|
||||
<< i, "Unexpected result"); \
|
||||
} \
|
||||
\
|
||||
for (i = 2; i < sizeof(t) * 8; i++) { \
|
||||
assert_##suf##_eq(pow2_ceil_##suf((((t)1) << i) - 1), \
|
||||
expect_##suf##_eq(pow2_ceil_##suf((((t)1) << i) - 1), \
|
||||
((t)1) << i, "Unexpected result"); \
|
||||
} \
|
||||
\
|
||||
for (i = 0; i < sizeof(t) * 8 - 1; i++) { \
|
||||
assert_##suf##_eq(pow2_ceil_##suf((((t)1) << i) + 1), \
|
||||
expect_##suf##_eq(pow2_ceil_##suf((((t)1) << i) + 1), \
|
||||
((t)1) << (i+1), "Unexpected result"); \
|
||||
} \
|
||||
\
|
||||
for (pow2 = 1; pow2 < 25; pow2++) { \
|
||||
for (x = (((t)1) << (pow2-1)) + 1; x <= ((t)1) << pow2; \
|
||||
x++) { \
|
||||
assert_##suf##_eq(pow2_ceil_##suf(x), \
|
||||
expect_##suf##_eq(pow2_ceil_##suf(x), \
|
||||
((t)1) << pow2, \
|
||||
"Unexpected result, x=%"pri, x); \
|
||||
} \
|
||||
@@ -49,35 +49,35 @@ TEST_BEGIN(test_pow2_ceil_zu) {
|
||||
TEST_END
|
||||
|
||||
void
|
||||
assert_lg_ceil_range(size_t input, unsigned answer) {
|
||||
expect_lg_ceil_range(size_t input, unsigned answer) {
|
||||
if (input == 1) {
|
||||
assert_u_eq(0, answer, "Got %u as lg_ceil of 1", answer);
|
||||
expect_u_eq(0, answer, "Got %u as lg_ceil of 1", answer);
|
||||
return;
|
||||
}
|
||||
assert_zu_le(input, (ZU(1) << answer),
|
||||
expect_zu_le(input, (ZU(1) << answer),
|
||||
"Got %u as lg_ceil of %zu", answer, input);
|
||||
assert_zu_gt(input, (ZU(1) << (answer - 1)),
|
||||
expect_zu_gt(input, (ZU(1) << (answer - 1)),
|
||||
"Got %u as lg_ceil of %zu", answer, input);
|
||||
}
|
||||
|
||||
void
|
||||
assert_lg_floor_range(size_t input, unsigned answer) {
|
||||
expect_lg_floor_range(size_t input, unsigned answer) {
|
||||
if (input == 1) {
|
||||
assert_u_eq(0, answer, "Got %u as lg_floor of 1", answer);
|
||||
expect_u_eq(0, answer, "Got %u as lg_floor of 1", answer);
|
||||
return;
|
||||
}
|
||||
assert_zu_ge(input, (ZU(1) << answer),
|
||||
expect_zu_ge(input, (ZU(1) << answer),
|
||||
"Got %u as lg_floor of %zu", answer, input);
|
||||
assert_zu_lt(input, (ZU(1) << (answer + 1)),
|
||||
expect_zu_lt(input, (ZU(1) << (answer + 1)),
|
||||
"Got %u as lg_floor of %zu", answer, input);
|
||||
}
|
||||
|
||||
TEST_BEGIN(test_lg_ceil_floor) {
|
||||
for (size_t i = 1; i < 10 * 1000 * 1000; i++) {
|
||||
assert_lg_ceil_range(i, lg_ceil(i));
|
||||
assert_lg_ceil_range(i, LG_CEIL(i));
|
||||
assert_lg_floor_range(i, lg_floor(i));
|
||||
assert_lg_floor_range(i, LG_FLOOR(i));
|
||||
expect_lg_ceil_range(i, lg_ceil(i));
|
||||
expect_lg_ceil_range(i, LG_CEIL(i));
|
||||
expect_lg_floor_range(i, lg_floor(i));
|
||||
expect_lg_floor_range(i, LG_FLOOR(i));
|
||||
}
|
||||
for (int i = 10; i < 8 * (1 << LG_SIZEOF_PTR) - 5; i++) {
|
||||
for (size_t j = 0; j < (1 << 4); j++) {
|
||||
@@ -85,17 +85,17 @@ TEST_BEGIN(test_lg_ceil_floor) {
|
||||
- j * ((size_t)1 << (i - 4));
|
||||
size_t num2 = ((size_t)1 << i)
|
||||
+ j * ((size_t)1 << (i - 4));
|
||||
assert_zu_ne(num1, 0, "Invalid lg argument");
|
||||
assert_zu_ne(num2, 0, "Invalid lg argument");
|
||||
assert_lg_ceil_range(num1, lg_ceil(num1));
|
||||
assert_lg_ceil_range(num1, LG_CEIL(num1));
|
||||
assert_lg_ceil_range(num2, lg_ceil(num2));
|
||||
assert_lg_ceil_range(num2, LG_CEIL(num2));
|
||||
expect_zu_ne(num1, 0, "Invalid lg argument");
|
||||
expect_zu_ne(num2, 0, "Invalid lg argument");
|
||||
expect_lg_ceil_range(num1, lg_ceil(num1));
|
||||
expect_lg_ceil_range(num1, LG_CEIL(num1));
|
||||
expect_lg_ceil_range(num2, lg_ceil(num2));
|
||||
expect_lg_ceil_range(num2, LG_CEIL(num2));
|
||||
|
||||
assert_lg_floor_range(num1, lg_floor(num1));
|
||||
assert_lg_floor_range(num1, LG_FLOOR(num1));
|
||||
assert_lg_floor_range(num2, lg_floor(num2));
|
||||
assert_lg_floor_range(num2, LG_FLOOR(num2));
|
||||
expect_lg_floor_range(num1, lg_floor(num1));
|
||||
expect_lg_floor_range(num1, LG_FLOOR(num1));
|
||||
expect_lg_floor_range(num2, lg_floor(num2));
|
||||
expect_lg_floor_range(num2, LG_FLOOR(num2));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user