fix ccall regex for minified code, and add testing

2 files changed, 6 insertions, 4 deletions

diff --git a/src/preamble.js b/src/preamble.js
index fbce6b6b..58b442ab 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -396,7 +396,7 @@ var cwrap, ccall;
     return ret;
   }
 
-  var sourceRegex = /^function\s\((.*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
+  var sourceRegex = /^function\s\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
   function parseJSFunc(jsfunc) {
     // Match the body and the return value of a javascript function source
     var parsed = jsfunc.toString().match(sourceRegex).slice(1);
diff --git a/tests/test_core.py b/tests/test_core.py
index 46d3964c..7e15f1b8 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -5453,9 +5453,6 @@ def process(filename):
   ### Integration tests
 
   def test_ccall(self):
-    if self.emcc_args is not None and '-O2' in self.emcc_args:
-      self.emcc_args += ['--closure', '1'] # Use closure here, to test we export things right
-
     post = '''
 def process(filename):
   src = \'\'\'
@@ -5499,6 +5496,11 @@ def process(filename):
 
     self.do_run_from_file(src, output, post_build=post)
 
+    if self.emcc_args is not None and '-O2' in self.emcc_args:
+      print 'with closure'
+      self.emcc_args += ['--closure', '1']
+      self.do_run_from_file(src, output, post_build=post)
+
   def test_pgo(self):
     if Settings.ASM_JS: return self.skip('PGO does not work in asm mode')