2 files changed, 10 insertions, 58 deletions

diff --git a/test/integration/chunk.c b/test/integration/chunk.c
index 1365989..2853709 100644
--- a/test/integration/chunk.c
+++ b/test/integration/chunk.c
@@ -1,13 +1,13 @@
 #include "test/jemalloc_test.h"
 
 chunk_alloc_t *old_alloc;
-chunk_dealloc_t *old_dealloc;
+chunk_dalloc_t *old_dalloc;
 
 bool
-chunk_dealloc(void *chunk, size_t size, unsigned arena_ind)
+chunk_dalloc(void *chunk, size_t size, unsigned arena_ind)
 {
 
-	return (old_dealloc(chunk, size, arena_ind));
+	return (old_dalloc(chunk, size, arena_ind));
 }
 
 void *
@@ -21,11 +21,11 @@ TEST_BEGIN(test_chunk)
 {
 	void *p;
 	chunk_alloc_t *new_alloc;
-	chunk_dealloc_t *new_dealloc;
+	chunk_dalloc_t *new_dalloc;
 	size_t old_size, new_size;
 
 	new_alloc = chunk_alloc;
-	new_dealloc = chunk_dealloc;
+	new_dalloc = chunk_dalloc;
 	old_size = sizeof(chunk_alloc_t *);
 	new_size = sizeof(chunk_alloc_t *);
 
@@ -34,11 +34,9 @@ TEST_BEGIN(test_chunk)
 	    "Unexpected alloc error");
 	assert_ptr_ne(old_alloc, new_alloc,
 	    "Unexpected alloc error");
-	assert_d_eq(mallctl("arena.0.chunk.dealloc", &old_dealloc,
-	    &old_size, &new_dealloc, new_size), 0,
-	    "Unexpected dealloc error");
-	assert_ptr_ne(old_dealloc, new_dealloc,
-	    "Unexpected dealloc error");
+	assert_d_eq(mallctl("arena.0.chunk.dalloc", &old_dalloc, &old_size,
+	    &new_dalloc, new_size), 0, "Unexpected dalloc error");
+	assert_ptr_ne(old_dalloc, new_dalloc, "Unexpected dalloc error");
 
 	p = mallocx(42, 0);
 	assert_ptr_ne(p, NULL, "Unexpected alloc error");
@@ -47,9 +45,8 @@ TEST_BEGIN(test_chunk)
 	assert_d_eq(mallctl("arena.0.chunk.alloc", NULL,
 	    NULL, &old_alloc, old_size), 0,
 	    "Unexpected alloc error");
-	assert_d_eq(mallctl("arena.0.chunk.dealloc", NULL,
-	    NULL, &old_dealloc, old_size), 0,
-	    "Unexpected dealloc error");
+	assert_d_eq(mallctl("arena.0.chunk.dalloc", NULL, NULL, &old_dalloc,
+	    old_size), 0, "Unexpected dalloc error");
 }
 TEST_END
 
diff --git a/test/integration/mremap.c b/test/integration/mremap.c
deleted file mode 100644
index a7fb7ef..0000000
--- a/test/integration/mremap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "test/jemalloc_test.h"
-
-TEST_BEGIN(test_mremap)
-{
-	int err;
-	size_t sz, lg_chunk, chunksize, i;
-	char *p, *q;
-
-	sz = sizeof(lg_chunk);
-	err = mallctl("opt.lg_chunk", &lg_chunk, &sz, NULL, 0);
-	assert_d_eq(err, 0, "Error in mallctl(): %s", strerror(err));
-	chunksize = ((size_t)1U) << lg_chunk;
-
-	p = (char *)malloc(chunksize);
-	assert_ptr_not_null(p, "malloc(%zu) --> %p", chunksize, p);
-	memset(p, 'a', chunksize);
-
-	q = (char *)realloc(p, chunksize * 2);
-	assert_ptr_not_null(q, "realloc(%p, %zu) --> %p", p, chunksize * 2,
-	    q);
-	for (i = 0; i < chunksize; i++) {
-		assert_c_eq(q[i], 'a',
-		    "realloc() should preserve existing bytes across copies");
-	}
-
-	p = q;
-
-	q = (char *)realloc(p, chunksize);
-	assert_ptr_not_null(q, "realloc(%p, %zu) --> %p", p, chunksize, q);
-	for (i = 0; i < chunksize; i++) {
-		assert_c_eq(q[i], 'a',
-		    "realloc() should preserve existing bytes across copies");
-	}
-
-	free(q);
-}
-TEST_END
-
-int
-main(void)
-{
-
-	return (test(
-	    test_mremap));
-}