Skip to content

[FS] Run test_chmod in nodefs. NFC #23230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 13, 2025
Merged

[FS] Run test_chmod in nodefs. NFC #23230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5af65b7
Run test_chmod in nodefs. NFC
hoodmane Dec 19, 2024
16d1ccd
Use with_all_fs
hoodmane Dec 19, 2024
aa3ec3d
Apply review comment
hoodmane Dec 24, 2024
d419fba
Fix test on windows
hoodmane Jan 6, 2025
255cdf1
Merge branch 'main' into nodefs-test-chmod
hoodmane Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/stat/test_chmod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ void test() {
lstat("file-link", &s);
assert(s.st_mode == link_mode);

// TODO: lchmod is not supported in NODEFS but it chmods the link target
// instead of raising an error. Will fix in a follow up to #23058.
#ifndef NODEFS
//
// chmod the actual symlink
//
Expand All @@ -157,6 +160,7 @@ void test() {
// make sure the file it references didn't change
stat("file-link", &s);
assert(s.st_mode == (S_IRUSR | S_IFREG));
#endif
#endif // WASMFS

assert(stat("", &s) == -1);
Expand Down
2 changes: 1 addition & 1 deletion test/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5529,7 +5529,7 @@ def test_stat_chmod(self):
nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
if nodefs and WINDOWS:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we use to run this test with -DNODEFS on windows, but not after this change?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooops, sorry I just saw that this change includes a change to the test (which presumably makes it no longer compatible with windows+nodefs). lgtm.

self.skipTest('mode bits work differently on windows')
if self.get_setting('WASMFS') and self.get_setting('NODERAWFS'):
if nodefs and self.get_setting('WASMFS'):
self.skipTest('test requires symlink creation which currently missing from wasmfs+noderawfs')
self.do_runf('stat/test_chmod.c', 'success')

Expand Down
Loading