LSan is just a link time thing, no need to optimize source in test

Author: quantum5

tests/core/test_lsan_leaks.c renamed to tests/other/test_lsan_leaks.c

@@ -7737,40 +7737,6 @@ def modify_env(filename):
     self.do_run(open(path_from_root('tests', 'core', 'test_ubsan_full_null_ref.cpp')).read(),
                 post_build=modify_env, assert_all=True, expected_output=expected_output)
 
-  @no_fastcomp('lsan not supported on fastcomp')
-  def test_lsan_leaks(self):
-    self.emcc_args += ['-fsanitize=leak']
-    self.set_setting('ALLOW_MEMORY_GROWTH', 1)
-    self.do_run(open(path_from_root('tests', 'core', 'test_lsan_leaks.c')).read(),
-                assert_all=True, check_for_error=False, expected_output=[
-      'Direct leak of 2048 byte(s) in 1 object(s) allocated from',
-      'Direct leak of 1337 byte(s) in 1 object(s) allocated from',
-      'Direct leak of 42 byte(s) in 1 object(s) allocated from',
-    ])
-
-  @no_fastcomp('lsan not supported on fastcomp')
-  def test_lsan_stack_trace(self):
-    self.emcc_args += ['-fsanitize=leak', '-g4']
-    self.set_setting('ALLOW_MEMORY_GROWTH', 1)
-    self.do_run(open(path_from_root('tests', 'core', 'test_lsan_leaks.c')).read(),
-                assert_all=True, check_for_error=False, expected_output=[
-      'Direct leak of 2048 byte(s) in 1 object(s) allocated from',
-      'Direct leak of 1337 byte(s) in 1 object(s) allocated from',
-      'Direct leak of 42 byte(s) in 1 object(s) allocated from',
-      'in main',
-      '/src.cpp:6:21',
-      '/src.cpp:10:16',
-      '/src.cpp:12:3',
-      '/src.cpp:13:3',
-    ])
-
-  @no_fastcomp('lsan not supported on fastcomp')
-  def test_lsan_no_leak(self):
-    self.emcc_args += ['-fsanitize=leak']
-    self.set_setting('ALLOW_MEMORY_GROWTH', 1)
-    self.do_run(open(path_from_root('tests', 'core', 'test_lsan_no_leak.c')).read(),
-                expected_output=[''])
-
 
 # Generate tests for everything
 def make_run(name, emcc_args, settings=None, env=None):

tests/core/test_lsan_no_leak.c renamed to tests/other/test_lsan_no_leak.c

@@ -7,6 +7,7 @@
 # noqa: E241
 
 from __future__ import print_function
+from functools import wraps
 import difflib
 import filecmp
 import glob
@@ -64,6 +65,7 @@ def uses_canonical_tmp(func):
   This decorator takes care of cleaning the directory after the
   test to satisfy the leak detector.
   """
+  @wraps(func)
   def decorated(self):
     # Before running the test completely remove the canonical_tmp
     if os.path.exists(self.canonical_temp_dir):
@@ -134,6 +136,19 @@ def do_other_test(self, dirname, emcc_args=[], run_args=[]):
     seen = run_js('a.out.js', args=run_args, stderr=PIPE, full_output=True) + '\n'
     self.assertContained(expected, seen)
 
+  def do_smart_test(self, source, literals=[], regexes=[], emcc_args=[], run_args=[], assert_returncode=0):
+    shutil.copyfile(source, 'test.cpp')
+    run_process([PYTHON, EMCC, 'test.cpp'] + emcc_args)
+    seen = run_js('a.out.js', args=run_args, stderr=PIPE, full_output=True,
+                  assert_returncode=assert_returncode) + '\n'
+
+    for literal in literals:
+      self.assertContained([literal], seen)
+
+    for regex in regexes:
+      if not re.search(regex, seen):
+        self.fail('Expected regex "%s" to match on:\n%s' % (regex, seen))
+
   def expect_fail(self, cmd, **args):
     """Run a subprocess and assert that it returns non-zero.
 
@@ -9233,3 +9248,35 @@ def test(code):
     assert lf - 900 <= f <= lf - 500
     # both is a little bigger still
     assert both - 100 <= lf <= both - 50
+
+  @no_fastcomp('lsan not supported on fastcomp')
+  def test_lsan_leaks(self):
+    self.do_smart_test(path_from_root('tests', 'other', 'test_lsan_leaks.c'),
+                       emcc_args=['-fsanitize=leak', '-s', 'ALLOW_MEMORY_GROWTH=1'],
+                       assert_returncode=None, literals=[
+      'Direct leak of 2048 byte(s) in 1 object(s) allocated from',
+      'Direct leak of 1337 byte(s) in 1 object(s) allocated from',
+      'Direct leak of 42 byte(s) in 1 object(s) allocated from',
+    ])
+
+  @no_fastcomp('lsan not supported on fastcomp')
+  def test_lsan_stack_trace(self):
+    self.do_smart_test(path_from_root('tests', 'other', 'test_lsan_leaks.c'),
+                       emcc_args=['-fsanitize=leak', '-s', 'ALLOW_MEMORY_GROWTH=1', '-g4'],
+                       assert_returncode=None, literals=[
+      'Direct leak of 2048 byte(s) in 1 object(s) allocated from',
+      'Direct leak of 1337 byte(s) in 1 object(s) allocated from',
+      'Direct leak of 42 byte(s) in 1 object(s) allocated from',
+    ], regexes=[
+      r'(?m)in malloc.*wasm-function',
+      r'(?m)in f\(\) /.*/test\.cpp:6:21$',
+      r'(?m)in main /.*/test\.cpp:10:16$',
+      r'(?m)in main /.*/test\.cpp:12:3$',
+      r'(?m)in main /.*/test\.cpp:13:3$',
+    ])
+
+  @no_fastcomp('lsan not supported on fastcomp')
+  def test_lsan_no_leak(self):
+    self.do_smart_test(path_from_root('tests', 'other', 'test_lsan_no_leak.c'),
+                       emcc_args=['-fsanitize=leak', '-s', 'ALLOW_MEMORY_GROWTH=1'],
+                       regexes=[r'^\s*$'])