Skip to content

Commit

Permalink
Rollup merge of #65187 - Wind-River:master_before_merge, r=rkruppe
Browse files Browse the repository at this point in the history
use 'invalid argument' for vxWorks

vxWorks is using "invalid argument" instead of "Invalid argument" in reporting invalid options

r? @rkruppe
  • Loading branch information
Centril committed Oct 8, 2019
2 parents f23c9f4 + 45f7186 commit bc7df81
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/libstd/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3112,8 +3112,10 @@ mod tests {

#[cfg(windows)]
let invalid_options = 87; // ERROR_INVALID_PARAMETER
#[cfg(unix)]
#[cfg(all(unix, not(target_os = "vxworks")))]
let invalid_options = "Invalid argument";
#[cfg(target_os = "vxworks")]
let invalid_options = "invalid argument";

// Test various combinations of creation modes and access modes.
//
Expand Down

0 comments on commit bc7df81

Please sign in to comment.