Rollup merge of rust-lang#119642 - petrochenkov:winstdtest, r=ChrisDenton

compiler-errors · web-flow · commit ad48a79b518f · 2024-01-05T23:41:45.000-05:00
library: Fix a symlink test failing on Windows
diff --git a/library/std/src/fs/tests.rs b/library/std/src/fs/tests.rs
@@ -936,8 +936,10 @@ fn read_link() {
         }
         // Check that readlink works with non-drive paths on Windows.
         let link = tmpdir.join("link_unc");
-        check!(symlink_dir(r"\\localhost\c$\", &link));
-        assert_eq!(check!(fs::read_link(&link)), Path::new(r"\\localhost\c$\"));
+        if got_symlink_permission(&tmpdir) {
+            check!(symlink_dir(r"\\localhost\c$\", &link));
+            assert_eq!(check!(fs::read_link(&link)), Path::new(r"\\localhost\c$\"));
+        };
     }
     let link = tmpdir.join("link");
     if !got_symlink_permission(&tmpdir) {

Original file line number	Diff line number	Diff line change
`@@ -936,8 +936,10 @@ fn read_link() {`
`936`	`936`	`}`
`937`	`937`	`// Check that readlink works with non-drive paths on Windows.`
`938`	`938`	`let link = tmpdir.join("link_unc");`
`939`		`- check!(symlink_dir(r"\\localhost\c$\", &link));`
`940`		`- assert_eq!(check!(fs::read_link(&link)), Path::new(r"\\localhost\c$\"));`
	`939`	`+ if got_symlink_permission(&tmpdir) {`
	`940`	`+ check!(symlink_dir(r"\\localhost\c$\", &link));`
	`941`	`+ assert_eq!(check!(fs::read_link(&link)), Path::new(r"\\localhost\c$\"));`
	`942`	`+ };`
`941`	`943`	`}`
`942`	`944`	`let link = tmpdir.join("link");`
`943`	`945`	`if !got_symlink_permission(&tmpdir) {`