Skip to content

Commit 2bc4461

Browse files
authored
[WasmFS] Enable NODEFS tests on WasmFS (#23482)
We had various tests disabled from before we had NODEFS support in WasmFS.
1 parent ee32d3a commit 2bc4461

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

test/test_core.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5853,14 +5853,11 @@ def test_fs_stat_unnamed_file_descriptor(self):
58535853
@crossplatform
58545854
@with_all_fs
58555855
def test_fs_symlink_resolution(self):
5856-
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
58575856
if self.get_setting('WASMFS'):
58585857
self.set_setting('FORCE_FILESYSTEM')
5859-
if nodefs:
5860-
if WINDOWS:
5861-
self.skipTest('No symlinks on Windows')
5862-
if self.get_setting('WASMFS'):
5863-
self.skipTest('NODEFS in WasmFS')
5858+
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
5859+
if nodefs and WINDOWS:
5860+
self.skipTest('No symlinks on Windows')
58645861
self.do_runf('fs/test_fs_symlink_resolution.c', 'success')
58655862

58665863
@with_all_fs
@@ -5907,11 +5904,8 @@ def test_sigaction_default(self, signal, exit_code, assert_identical):
59075904
@crossplatform
59085905
@with_all_fs
59095906
def test_unistd_access(self):
5910-
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
59115907
if self.get_setting('WASMFS'):
59125908
self.set_setting('FORCE_FILESYSTEM')
5913-
if nodefs:
5914-
self.skipTest('NODEFS in WasmFS')
59155909
# On windows we have slighly different output because we the same
59165910
# level of permissions are not available. For example, on windows
59175911
# its not possible have a file that is not readable, but writable.
@@ -5946,11 +5940,8 @@ def test_unistd_dup(self):
59465940

59475941
@with_all_fs
59485942
def test_unistd_truncate(self):
5949-
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
59505943
if self.get_setting('WASMFS'):
59515944
self.set_setting('FORCE_FILESYSTEM')
5952-
if nodefs:
5953-
self.skipTest('TODO: NODEFS in WasmFS')
59545945
if WINDOWS or os.geteuid() == 0:
59555946
self.skipTest('Root access invalidates this test by being able to write on readonly files')
59565947
self.do_run_in_out_file_test('unistd/truncate.c')
@@ -5982,10 +5973,6 @@ def test_unistd_sysconf_phys_pages(self):
59825973
@no_windows('https://github.com/emscripten-core/emscripten/issues/8882')
59835974
@with_all_fs
59845975
def test_unistd_unlink(self):
5985-
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
5986-
if self.get_setting('WASMFS') and nodefs:
5987-
self.skipTest('NODEFS in WasmFS')
5988-
59895976
# symlinks on node.js on non-linux behave differently (e.g. on Windows they require administrative privileges)
59905977
# so skip testing those bits on that combination.
59915978
if '-DNODEFS' in self.emcc_args:
@@ -6035,8 +6022,6 @@ def test_unistd_symlink_on_nodefs(self):
60356022
@also_with_nodefs
60366023
def test_unistd_io(self):
60376024
if self.get_setting('WASMFS'):
6038-
if '-DNODEFS' in self.emcc_args:
6039-
self.skipTest('NODEFS in WasmFS')
60406025
self.set_setting('FORCE_FILESYSTEM')
60416026
self.do_run_in_out_file_test('unistd/io.c')
60426027

0 commit comments

Comments
 (0)