diff options
| author | Jason Evans <je@fb.com> | 2014-05-16 05:38:52 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2014-05-16 05:38:52 (GMT) |
| commit | d4a238ccb0a88cd65cb6f38a517ed46e143d2fd1 (patch) | |
| tree | 511826b7cb6a2fd926f0e9018ef4c7d76cae6569 /Makefile.in | |
| parent | 4bbd11b78932cdae1fe8a856141f5837f5b4c621 (diff) | |
| parent | e2deab7a751c8080c2b2cdcfd7b11887332be1bb (diff) | |
| download | jemalloc-d4a238ccb0a88cd65cb6f38a517ed46e143d2fd1.zip jemalloc-d4a238ccb0a88cd65cb6f38a517ed46e143d2fd1.tar.gz jemalloc-d4a238ccb0a88cd65cb6f38a517ed46e143d2fd1.tar.bz2 | |
Merge branch 'pr/80' into dev
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index e411804..90869eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,12 +137,12 @@ TESTS_INTEGRATION := $(srcroot)test/integration/aligned_alloc.c \ $(srcroot)test/integration/allocated.c \ $(srcroot)test/integration/mallocx.c \ $(srcroot)test/integration/MALLOCX_ARENA.c \ - $(srcroot)test/integration/mremap.c \ $(srcroot)test/integration/posix_memalign.c \ $(srcroot)test/integration/rallocx.c \ $(srcroot)test/integration/thread_arena.c \ $(srcroot)test/integration/thread_tcache_enabled.c \ - $(srcroot)test/integration/xallocx.c + $(srcroot)test/integration/xallocx.c \ + $(srcroot)test/integration/chunk.c TESTS_STRESS := TESTS := $(TESTS_UNIT) $(TESTS_INTEGRATION) $(TESTS_STRESS) |