aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-08-15 11:37:18 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-08-15 11:37:18 +0200
commitf9769a239784772453d595bc2f4bed8739810e06 (patch)
tree9275a1a05811d349e1e28358da02cedd81cc9df5 /malloc
parent341da5b4b6253de9a7581a066f33f89cacb44dec (diff)
downloadglibc-f9769a239784772453d595bc2f4bed8739810e06.zip
glibc-f9769a239784772453d595bc2f4bed8739810e06.tar.gz
glibc-f9769a239784772453d595bc2f4bed8739810e06.tar.bz2
malloc: Various cleanups for malloc/tst-mxfast
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile3
-rw-r--r--malloc/tst-mxfast.c14
2 files changed, 8 insertions, 9 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index 94b74b5..742c515 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -39,7 +39,6 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
tst-malloc-too-large \
tst-malloc-stats-cancellation \
tst-tcfree1 tst-tcfree2 tst-tcfree3 \
- tst-mxfast \
tests-static := \
tst-interpose-static-nothread \
@@ -55,7 +54,7 @@ tests-internal += \
tst-dynarray-at-fail \
ifneq (no,$(have-tunables))
-tests += tst-malloc-usable-tunables
+tests += tst-malloc-usable-tunables tst-mxfast
tests-static += tst-malloc-usable-static-tunables
endif
diff --git a/malloc/tst-mxfast.c b/malloc/tst-mxfast.c
index 7a371d2..7a7750b 100644
--- a/malloc/tst-mxfast.c
+++ b/malloc/tst-mxfast.c
@@ -1,5 +1,5 @@
/* Test that glibc.malloc.mxfast tunable works.
- Copyright (C) 2018, 2019 Free Software Foundation, Inc.
+ Copyright (C) 2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,14 +21,14 @@
the fast bins. */
#include <malloc.h>
-#include <assert.h>
+#include <support/check.h>
int
-do_test(void)
+do_test (void)
{
struct mallinfo m;
- char * volatile p1;
- char * volatile p2;
+ char *volatile p1;
+ char *volatile p2;
/* Arbitrary value; must be in default fastbin range. */
p1 = malloc (3);
@@ -36,10 +36,10 @@ do_test(void)
p2 = malloc (512);
free (p1);
- m = mallinfo();
+ m = mallinfo ();
/* This will fail if there are any blocks in the fastbins. */
- assert (m.smblks == 0);
+ TEST_COMPARE (m.smblks, 0);
/* To keep gcc happy. */
free (p2);