Add more explicit testing for MAIN_MODULE exports. NFC

Author: sbc100

tests/common.py

@@ -743,6 +743,22 @@ def assertTextDataContained(self, text1, text2):
     text2 = text2.replace('\r\n', '\n')
     return self.assertContained(text1, text2)
 
+  def assertFileContents(self, filename, contents):
+    contents = contents.replace('\r', '')
+
+    if EMTEST_REBASELINE:
+      with open(filename, 'w') as f:
+        f.write(contents)
+      return
+
+    if not os.path.exists(filename):
+      self.fail('Test expectation file not found: ' + filename + '.\n' +
+                'Run with EMTEST_REBASELINE to generate.')
+    expected_content = read_file(filename)
+    message = "Run with EMTEST_REBASELINE=1 to automatically update expectations"
+    self.assertTextDataIdentical(expected_content, contents, message,
+                                 filename, filename + '.new')
+
   def assertContained(self, values, string, additional_info=''):
     if type(values) not in [list, tuple]:
       values = [values]

tests/core/test_dlfcn_self.exports

@@ -0,0 +1,51 @@
+__THREW__
+___environ
+__c_dot_utf8
+__c_dot_utf8_locale
+__c_locale
+__data_end
+__dso_handle
+__env_map
+__environ
+__fsmu8
+__hwcap
+__libc
+__optpos
+__optreset
+__pio2_hi
+__pio2_lo
+__progname
+__progname_full
+__seed48
+__sig_actions
+__sig_pending
+__signgam
+__stderr_used
+__stdin_used
+__stdout_used
+__sysinfo
+__threwValue
+_environ
+_ns_flagdata
+aT
+atanhi
+atanlo
+daylight
+environ
+global
+h_errno
+in6addr_any
+in6addr_loopback
+optarg
+opterr
+optind
+optopt
+optreset
+program_invocation_name
+program_invocation_short_name
+signgam
+stderr
+stdin
+stdout
+timezone
+tzname

tests/test_core.py

@@ -1749,17 +1749,16 @@ def test_set_align(self):
 
     self.do_core_test('test_set_align.c')
 
+  @no_asan('EXPORT_ALL is not compatible with Asan')
   def test_emscripten_api(self):
     self.set_setting('EXPORTED_FUNCTIONS', ['_main', '_save_me_aimee'])
     self.do_core_test('test_emscripten_api.cpp')
 
-    if '-fsanitize=address' not in self.emcc_args:
-      # test EXPORT_ALL (this is not compatible with asan, which doesn't
-      # support dynamic linking at all or the LINKING flag)
-      self.set_setting('EXPORTED_FUNCTIONS', [])
-      self.set_setting('EXPORT_ALL')
-      self.set_setting('LINKABLE')
-      self.do_core_test('test_emscripten_api.cpp')
+    # test EXPORT_ALL
+    self.set_setting('EXPORTED_FUNCTIONS', [])
+    self.set_setting('EXPORT_ALL')
+    self.set_setting('LINKABLE')
+    self.do_core_test('test_emscripten_api.cpp')
 
   def test_emscripten_run_script_string_int(self):
     src = r'''
@@ -3073,18 +3072,18 @@ def test_dlfcn_self(self):
     self.set_setting('MAIN_MODULE')
     self.set_setting('EXPORT_ALL')
 
-    def get_data_export_count(wasm):
+    def get_data_exports(wasm):
       wat = self.get_wasm_text(wasm)
       lines = wat.splitlines()
       exports = [l for l in lines if l.strip().startswith('(export ')]
       data_exports = [l for l in exports if '(global ' in l]
-      return len(data_exports)
+      data_exports = [d.split()[1].strip('"') for d in data_exports]
+      return data_exports
 
     self.do_core_test('test_dlfcn_self.c')
-    export_count = get_data_export_count('test_dlfcn_self.wasm')
-    # ensure there aren't too many globals; we don't want unnamed_addr
-    self.assertGreater(export_count, 20)
-    self.assertLess(export_count, 56)
+    data_exports = get_data_exports('test_dlfcn_self.wasm')
+    data_exports = '\n'.join(sorted(data_exports)) + '\n'
+    self.assertFileContents(test_file('core/test_dlfcn_self.exports'), data_exports)
 
   @needs_dylink
   def test_dlfcn_unique_sig(self):

tests/test_other.py

@@ -7090,22 +7090,6 @@ def build(args=[]):
     # adding --metrics should not affect code size
     self.assertEqual(base_size, os.path.getsize('a.out.wasm'))
 
-  def assertFileContents(self, filename, contents):
-    contents = contents.replace('\r', '')
-
-    if common.EMTEST_REBASELINE:
-      with open(filename, 'w') as f:
-        f.write(contents)
-      return
-
-    if not os.path.exists(filename):
-      self.fail('Test expectation file not found: ' + filename + '.\n' +
-                'Run with EMTEST_REBASELINE to generate.')
-    expected_content = read_file(filename)
-    message = "Run with EMTEST_REBASELINE=1 to automatically update expectations"
-    self.assertTextDataIdentical(expected_content, contents, message,
-                                 filename, filename + '.new')
-
   def run_metadce_test(self, filename, args, expected_exists, expected_not_exists, check_size=True,
                        check_sent=True, check_imports=True, check_exports=True, check_funcs=True):
     size_slack = 0.05