From 35f1bc4e4bd14e07257f6eddbbbcf0c01b52ba5c Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Tue, 14 Jan 2014 17:49:37 -0800
Subject: Fix warnings and a test failure exposed on CentOS 6.3.
---
test/unit/stats.c | 7 +++++--
test/unit/util.c | 2 --
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/unit/stats.c b/test/unit/stats.c
index 3fa0817..6ebe369 100644
--- a/test/unit/stats.c
+++ b/test/unit/stats.c
@@ -148,6 +148,9 @@ TEST_BEGIN(test_stats_arenas_small)
p = mallocx(SMALL_MAXCLASS, 0);
assert_ptr_not_null(p, "Unexpected mallocx() failure");
+ assert_d_eq(mallctl("thread.tcache.flush", NULL, NULL, NULL, 0),
+ config_tcache ? 0 : ENOENT, "Unexpected mallctl() result");
+
assert_d_eq(mallctl("epoch", NULL, NULL, &epoch, sizeof(epoch)), 0,
"Unexpected mallctl() failure");
@@ -164,13 +167,13 @@ TEST_BEGIN(test_stats_arenas_small)
if (config_stats) {
assert_zu_gt(allocated, 0,
- "allocated should be greated than zero");
+ "allocated should be greater than zero");
assert_u64_gt(nmalloc, 0,
"nmalloc should be no greater than zero");
assert_u64_ge(nmalloc, ndalloc,
"nmalloc should be at least as large as ndalloc");
assert_u64_gt(nrequests, 0,
- "nrequests should be no greater than zero");
+ "nrequests should be greater than zero");
}
dallocx(p, 0);
diff --git a/test/unit/util.c b/test/unit/util.c
index 1f2f575..4b4d19d 100644
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -151,7 +151,6 @@ TEST_BEGIN(test_malloc_snprintf_truncated)
} while (0)
for (len = 1; len < BUFLEN; len++) {
- TEST("", "");
TEST("012346789", "012346789");
TEST("a0123b", "a%sb", "0123");
TEST("a01234567", "a%s%s", "0123", "4567");
@@ -180,7 +179,6 @@ TEST_BEGIN(test_malloc_snprintf)
assert_d_eq(result, strlen(expected_str), "Unexpected result"); \
} while (0)
- TEST("", "");
TEST("hello", "hello");
TEST("a0123b", "a%sb", "0123");
--
cgit v0.12