Skip to content

Commit ed1791c

Browse files
committed
Fix the Unix permission tests affected by rust-lang/rust#44624.
1 parent 016bf56 commit ed1791c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/rustup-dist/tests/install.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,21 +337,21 @@ fn unix_permissions() {
337337
let tx = pkg.install(&components, "mycomponent", None, tx).unwrap();
338338
tx.commit();
339339

340-
let m = fs::metadata(instdir.path().join("bin/foo")).unwrap().permissions().mode();
340+
let m = 0o777 & fs::metadata(instdir.path().join("bin/foo")).unwrap().permissions().mode();
341341
assert_eq!(m, 0o755);
342-
let m = fs::metadata(instdir.path().join("lib/bar")).unwrap().permissions().mode();
342+
let m = 0o777 & fs::metadata(instdir.path().join("lib/bar")).unwrap().permissions().mode();
343343
assert_eq!(m, 0o644);
344-
let m = fs::metadata(instdir.path().join("lib/foobar")).unwrap().permissions().mode();
344+
let m = 0o777 & fs::metadata(instdir.path().join("lib/foobar")).unwrap().permissions().mode();
345345
assert_eq!(m, 0o755);
346-
let m = fs::metadata(instdir.path().join("doc/stuff/")).unwrap().permissions().mode();
346+
let m = 0o777 & fs::metadata(instdir.path().join("doc/stuff/")).unwrap().permissions().mode();
347347
assert_eq!(m, 0o755);
348-
let m = fs::metadata(instdir.path().join("doc/stuff/doc1")).unwrap().permissions().mode();
348+
let m = 0o777 & fs::metadata(instdir.path().join("doc/stuff/doc1")).unwrap().permissions().mode();
349349
assert_eq!(m, 0o644);
350-
let m = fs::metadata(instdir.path().join("doc/stuff/morestuff")).unwrap().permissions().mode();
350+
let m = 0o777 & fs::metadata(instdir.path().join("doc/stuff/morestuff")).unwrap().permissions().mode();
351351
assert_eq!(m, 0o755);
352-
let m = fs::metadata(instdir.path().join("doc/stuff/morestuff/doc2")).unwrap().permissions().mode();
352+
let m = 0o777 & fs::metadata(instdir.path().join("doc/stuff/morestuff/doc2")).unwrap().permissions().mode();
353353
assert_eq!(m, 0o644);
354-
let m = fs::metadata(instdir.path().join("doc/stuff/morestuff/tool")).unwrap().permissions().mode();
354+
let m = 0o777 & fs::metadata(instdir.path().join("doc/stuff/morestuff/tool")).unwrap().permissions().mode();
355355
assert_eq!(m, 0o755);
356356
}
357357

0 commit comments

Comments
 (0)