consolidate dlmalloc.c files; fixes test_dlmalloc_linked

src/dlmalloc.c

@@ -1,4 +1,7 @@
 #include "emscripten.h"
+#define __THROW
+#define __attribute_malloc__
+#define __wur
 
 /*
   This is a version (aka dlmalloc) of malloc/free/realloc written by
@@ -590,7 +593,7 @@ MAX_RELEASE_CHECK_RATE   default: 4095 unless not HAVE_MMAP
 #define MMAP_CLEARS 1
 #endif  /* MMAP_CLEARS */
 #ifndef HAVE_MREMAP
-#ifdef linux
+#if linux && !defined(EMSCRIPTEN)
 #define HAVE_MREMAP 1
 #else   /* linux */
 #define HAVE_MREMAP 0

tests/runner.py

@@ -2978,7 +2978,7 @@ if 'benchmark' not in str(sys.argv):
       global CORRECT_SIGNS; CORRECT_SIGNS = 2
       global CORRECT_SIGNS_LINES; CORRECT_SIGNS_LINES = ['src.cpp:' + str(i) for i in [4816, 4191, 4246, 4199, 4205, 4235, 4227]]
 
-      src = open(path_from_root('tests', 'dlmalloc.c'), 'r').read()
+      src = open(path_from_root('src', 'dlmalloc.c'), 'r').read() + '\n\n\n' + open(path_from_root('tests', 'dlmalloc.c'), 'r').read()
       self.do_test(src, '*1,0*', ['200', '1'])
       self.do_test(src, '*400,0*', ['400', '400'], no_build=True)