4 files changed, 42 insertions, 3 deletions
diff --git a/tests/fuzz/csmith_driver.py b/tests/fuzz/csmith_driver.py
index 238acb9a..76d646dd 100755
--- a/tests/fuzz/csmith_driver.py
+++ b/tests/fuzz/csmith_driver.py
@@ -121,7 +121,7 @@ while 1:
     print "EMSCRIPTEN BUG"
     notes['embug'] += 1
     fails += 1
-    shutil.copyfile(fullname, 'newfail%d%s' % (fails, suffix))
+    shutil.copyfile(fullname, 'newfail%d%s%s' % (fails, opts.replace('-', '_'), suffix))
     continue
   #if not ok:
   #  try: # finally, try with safe heap. if that is triggered, this is nonportable code almost certainly
diff --git a/tests/mem_init.cpp b/tests/mem_init.cpp
new file mode 100644
index 00000000..e642bfc9
--- /dev/null
+++ b/tests/mem_init.cpp
@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <emscripten.h>
+
+extern "C" {
+
+int noted = 0;
+
+void EMSCRIPTEN_KEEPALIVE note(int n) {
+  EM_ASM_({ Module.print([$0, $1]) }, n, noted);
+  noted = noted | n;
+  EM_ASM_({ Module.print(['noted is now', $0]) }, noted);
+  if (noted == 3) {
+    int result = noted;
+    REPORT_RESULT();
+  }
+}
+
+}
+
+int main() {
+  EM_ASM( myJSCallback() ); // calls a global JS func
+  return 0;
+}
+
diff --git a/tests/test_browser.py b/tests/test_browser.py
index 44ad04a6..d49244e2 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -1670,6 +1670,23 @@ void *getBindBuffer() {
     for mem in [0, 1]:
       self.btest('pre_run_deps.cpp', expected='10', args=['--pre-js', 'pre.js', '--memory-init-file', str(mem)])
 
+  def test_mem_init(self):
+    open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
+      function myJSCallback() { // called from main()
+        Module._note(1);
+      }
+      Module.preRun = function() {
+        addOnPreMain(function() {
+          Module._note(2);
+        });
+      };
+    ''')
+    open(os.path.join(self.get_dir(), 'post.js'), 'w').write('''
+      Module._note(4); // this happens too early! and is overwritten when the mem init arrives
+    ''')
+
+    self.btest('mem_init.cpp', expected='3', args=['--pre-js', 'pre.js', '--post-js', 'post.js', '--memory-init-file', '1'])
+
   def test_worker_api(self):
     Popen([PYTHON, EMCC, path_from_root('tests', 'worker_api_worker.cpp'), '-o', 'worker.js', '-s', 'BUILD_AS_WORKER=1', '-s', 'EXPORTED_FUNCTIONS=["_one"]']).communicate()
     self.btest('worker_api_main.cpp', expected='566')
diff --git a/tests/test_other.py b/tests/test_other.py
index 9e9c9bef..5af2b22c 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -114,8 +114,6 @@ Options that are modified or new in %s include:
         os.chdir(self.get_dir())
       self.clear()
 
-      # dlmalloc. dlmalloc is special in that it is the only part of libc that is (1) hard to write well, and
-      # very speed-sensitive. So we do not implement it in JS in library.js, instead we compile it from source
       for source, has_malloc in [('hello_world' + suffix, False), ('hello_malloc.cpp', True)]:
         print source, has_malloc
         self.clear()