1
Fork 0

Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2015-03-06 15:53:32 -08:00
parent 11ddfb8af0
commit aed31ee08e
4 changed files with 9 additions and 5 deletions

View file

@ -31,8 +31,8 @@
#![feature(libc)]
#![feature(link_args)]
#![feature(staged_api)]
#![feature(std_misc)]
#![feature(path)]
#![cfg_attr(unix, feature(std_misc))]
extern crate libc;
#[macro_use] #[no_link] extern crate rustc_bitflags;

View file

@ -40,11 +40,9 @@
#![feature(unicode)]
#![feature(io)]
#![feature(path)]
#![feature(os)]
#![feature(path_ext)]
#![feature(fs)]
#![feature(hash)]
#![feature(tempdir)]
extern crate arena;
extern crate flate;

View file

@ -1313,6 +1313,8 @@ mod tests {
check!(fs::set_permissions(&input, p));
check!(fs::copy(&input, &out));
assert!(check!(out.metadata()).permissions().readonly());
check!(fs::set_permissions(&input, attr.permissions()));
check!(fs::set_permissions(&out, attr.permissions()));
}
#[cfg(not(windows))] // FIXME(#10264) operation not permitted?
@ -1396,10 +1398,13 @@ mod tests {
let attr = check!(fs::metadata(&file));
assert!(attr.permissions().readonly());
match fs::set_permissions(&tmpdir.join("foo"), p) {
Ok(..) => panic!("wanted a panic"),
match fs::set_permissions(&tmpdir.join("foo"), p.clone()) {
Ok(..) => panic!("wanted an error"),
Err(..) => {}
}
p.set_readonly(false);
check!(fs::set_permissions(&file, p));
}
#[test]

View file

@ -592,6 +592,7 @@ mod tests {
}
#[test]
#[cfg(not(windows))]
fn to_socket_addr_str_bad() {
assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
}