Merge @also_with_wasmfs_all_backends with @with_all_fs. (emscripten-core#23838)

I had to disable one new test config due to emscripten-core#18112.

Author: sbc100

test/common.py

@@ -446,30 +446,26 @@ def metafunc(self, fs, *args, **kwargs):
 
 def with_all_fs(func):
   @wraps(func)
-  def metafunc(self, fs, *args, **kwargs):
+  def metafunc(self, wasmfs, fs, *args, **kwargs):
     if DEBUG:
       print('parameterize:fs=%s' % (fs))
+    if wasmfs:
+      self.setup_wasmfs_test()
     if fs == 'nodefs':
       self.setup_nodefs_test()
     elif fs == 'rawfs':
       self.setup_noderawfs_test()
-    elif fs == 'wasmfs':
-      self.setup_wasmfs_test()
-    elif fs == 'wasmfs_rawfs':
-      self.setup_wasmfs_test()
-      self.setup_noderawfs_test()
     else:
       self.emcc_args += ['-DMEMFS']
       assert fs is None
     func(self, *args, **kwargs)
 
-  # TODO(sbc): rather than treat WASMFS as orthogonal we should
-  # probably make it combinatorial with nodefs and noderawfs.
-  parameterize(metafunc, {'': (None,),
-                          'nodefs': ('nodefs',),
-                          'rawfs': ('rawfs',),
-                          'wasmfs': ('wasmfs',),
-                          'wasmfs_rawfs': ('wasmfs_rawfs',)})
+  parameterize(metafunc, {'': (False, None,),
+                          'nodefs': (False, 'nodefs',),
+                          'rawfs': (False, 'rawfs',),
+                          'wasmfs': (True, None,),
+                          'wasmfs_nodefs': (True, 'nodefs',),
+                          'wasmfs_rawfs': (True, 'rawfs',)})
   return metafunc
 
 

test/test_core.py

@@ -5994,6 +5994,8 @@ def test_unistd_unlink(self):
         self.emcc_args += ['-DNO_SYMLINK=1']
       if MACOS:
         self.skipTest('only tested on linux')
+      if self.get_setting('WASMFS'):
+        self.skipTest('https://github.com/emscripten-core/emscripten/issues/18112')
 
     # Several differences/bugs on non-linux including https://github.com/nodejs/node/issues/18014
     # TODO: NODERAWFS in WasmFS

test/test_other.py

@@ -131,27 +131,6 @@ def metafunc(self, backend, *args, **kwargs):
   return metafunc
 
 
-def also_with_wasmfs_all_backends(f):
-  assert callable(f)
-
-  @wraps(f)
-  def metafunc(self, backend, *args, **kwargs):
-    if backend:
-      self.setup_wasmfs_test()
-      if backend == 'node':
-        self.setup_nodefs_test()
-      elif backend == 'raw':
-        self.setup_noderawfs_test()
-      self.emcc_args.append(f'-D{backend}')
-    f(self, *args, **kwargs)
-
-  parameterize(metafunc, {'': (None,),
-                          'wasmfs': ('memory',),
-                          'wasmfs_node': ('node',),
-                          'wasmfs_raw': ('raw',)})
-  return metafunc
-
-
 def requires_tool(tool, env_name=None):
   assert not callable(tool)
 
@@ -5777,7 +5756,7 @@ def test_init_file_at_offset(self):
 
   @no_mac("TODO: investigate different Node FS semantics on Mac")
   @no_windows("TODO: investigate different Node FS semantics on Windows")
-  @also_with_wasmfs_all_backends
+  @with_all_fs
   def test_unlink(self):
     self.do_other_test('test_unlink.cpp')
 

tools/emscripten.py

@@ -1033,6 +1033,7 @@ def create_pointer_conversion_wrappers(metadata):
     '_emscripten_stack_alloc': 'pp',
     'emscripten_builtin_malloc': 'pp',
     'emscripten_builtin_calloc': 'ppp',
+    'wasmfs_create_node_backend': 'pp',
     'malloc': 'pp',
     'calloc': 'ppp',
     'webidl_malloc': 'pp',
@@ -1083,6 +1084,8 @@ def create_pointer_conversion_wrappers(metadata):
     '_wasmfs_unlink': '_p',
     '_wasmfs_mkdir': '_p_',
     '_wasmfs_open': '_p__',
+    '_wasmfs_mount': '_pp',
+    '_wasmfs_chdir': '_p',
     'asyncify_start_rewind': '_p',
     'asyncify_start_unwind': '_p',
     '__get_exception_message': '_ppp',