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:
Yinan Zhang
2020-02-18 14:39:06 -08:00
parent 162c2bcf31
commit 21dfa4300d
85 changed files with 1854 additions and 1854 deletions

View File

@@ -7,7 +7,7 @@ allocated() {
}
uint64_t allocated;
size_t sz = sizeof(allocated);
assert_d_eq(mallctl("thread.allocated", (void *)&allocated, &sz, NULL,
expect_d_eq(mallctl("thread.allocated", (void *)&allocated, &sz, NULL,
0), 0, "Unexpected mallctl failure");
return allocated;
}
@@ -19,23 +19,23 @@ deallocated() {
}
uint64_t deallocated;
size_t sz = sizeof(deallocated);
assert_d_eq(mallctl("thread.deallocated", (void *)&deallocated, &sz,
expect_d_eq(mallctl("thread.deallocated", (void *)&deallocated, &sz,
NULL, 0), 0, "Unexpected mallctl failure");
return deallocated;
}
TEST_BEGIN(test_realloc_strict) {
void *ptr = mallocx(1, 0);
assert_ptr_not_null(ptr, "Unexpected mallocx error");
expect_ptr_not_null(ptr, "Unexpected mallocx error");
uint64_t allocated_before = allocated();
uint64_t deallocated_before = deallocated();
ptr = realloc(ptr, 0);
uint64_t allocated_after = allocated();
uint64_t deallocated_after = deallocated();
if (config_stats) {
assert_u64_lt(allocated_before, allocated_after,
expect_u64_lt(allocated_before, allocated_after,
"Unexpected stats change");
assert_u64_lt(deallocated_before, deallocated_after,
expect_u64_lt(deallocated_before, deallocated_after,
"Unexpected stats change");
}
dallocx(ptr, 0);