diff options
| author | Jason Evans <jasone@canonware.com> | 2017-02-22 07:40:06 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2017-02-23 16:57:02 (GMT) |
| commit | de49674fbde4d124a0a7e7e97f5656e190980759 (patch) | |
| tree | 9a29c6d5f569ea6098cc85663b4cb0e7bba4dc3f /test/unit/junk.c | |
| parent | 8ac7937eb5ce011945188ef3553dbc2bcc294a25 (diff) | |
| download | jemalloc-de49674fbde4d124a0a7e7e97f5656e190980759.zip jemalloc-de49674fbde4d124a0a7e7e97f5656e190980759.tar.gz jemalloc-de49674fbde4d124a0a7e7e97f5656e190980759.tar.bz2 | |
Use MALLOC_CONF rather than malloc_conf for tests.
malloc_conf does not reliably work with MSVC, which complains of
"inconsistent dll linkage", i.e. its inability to support the
application overriding malloc_conf when dynamically linking/loading.
Work around this limitation by adding test harness support for per test
shell script sourcing, and converting all tests to use MALLOC_CONF
instead of malloc_conf.
Diffstat (limited to 'test/unit/junk.c')
| -rw-r--r-- | test/unit/junk.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/unit/junk.c b/test/unit/junk.c index 86c5108..cfa8d0f 100644 --- a/test/unit/junk.c +++ b/test/unit/junk.c @@ -1,13 +1,5 @@ #include "test/jemalloc_test.h" -#ifdef JEMALLOC_FILL -# ifndef JEMALLOC_TEST_JUNK_OPT -# define JEMALLOC_TEST_JUNK_OPT "junk:true" -# endif -const char *malloc_conf = - "abort:false,zero:false," JEMALLOC_TEST_JUNK_OPT; -#endif - static arena_dalloc_junk_small_t *arena_dalloc_junk_small_orig; static large_dalloc_junk_t *large_dalloc_junk_orig; static large_dalloc_maybe_junk_t *large_dalloc_maybe_junk_orig; |