diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-12-07 00:09:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 00:09:57 +0900 |
| commit | cdbdb686f9a5f2ba5751e97d4a172d2d6ba0c62c (patch) | |
| tree | cb63052cc9c693b69e7acf14fc6bcc55a1b711b9 /src/libstd | |
| parent | 7249af0c7b7fbaefe9cb63f6e6c6fa35fb975cff (diff) | |
| parent | dc1a428d871c023fab0440cb4c6c9b8fae566002 (diff) | |
| download | rust-cdbdb686f9a5f2ba5751e97d4a172d2d6ba0c62c.tar.gz rust-cdbdb686f9a5f2ba5751e97d4a172d2d6ba0c62c.zip | |
Rollup merge of #66998 - Wind-River:master_up, r=alexcrichton
Modified the testcases for VxWorks
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index e5cf022f044..a109e38e1e3 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -2339,8 +2339,10 @@ mod tests { let filename = &tmpdir.join("file_that_does_not_exist.txt"); let result = File::open(filename); - #[cfg(unix)] + #[cfg(all(unix, not(target_os = "vxworks")))] error!(result, "No such file or directory"); + #[cfg(target_os = "vxworks")] + error!(result, "no such file or directory"); #[cfg(windows)] error!(result, 2); // ERROR_FILE_NOT_FOUND } @@ -2352,8 +2354,10 @@ mod tests { let result = fs::remove_file(filename); - #[cfg(unix)] + #[cfg(all(unix, not(target_os = "vxworks")))] error!(result, "No such file or directory"); + #[cfg(target_os = "vxworks")] + error!(result, "no such file or directory"); #[cfg(windows)] error!(result, 2); // ERROR_FILE_NOT_FOUND } @@ -2553,7 +2557,10 @@ mod tests { check!(fs::set_permissions(filename, fs::Permissions::from_mode(0o1777))); let metadata1 = check!(fs::metadata(filename)); + #[cfg(all(unix, not(target_os = "vxworks")))] assert_eq!(mask & metadata1.permissions().mode(), 0o1777); + #[cfg(target_os = "vxworks")] + assert_eq!(mask & metadata1.permissions().mode(), 0o0777); } #[test] |