Skip to content

Commit bc7df81

Browse files
authored
Rollup merge of #65187 - Wind-River:master_before_merge, r=rkruppe
use 'invalid argument' for vxWorks vxWorks is using "invalid argument" instead of "Invalid argument" in reporting invalid options r? @rkruppe
2 parents f23c9f4 + 45f7186 commit bc7df81

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/libstd/fs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -3112,8 +3112,10 @@ mod tests {
31123112

31133113
#[cfg(windows)]
31143114
let invalid_options = 87; // ERROR_INVALID_PARAMETER
3115-
#[cfg(unix)]
3115+
#[cfg(all(unix, not(target_os = "vxworks")))]
31163116
let invalid_options = "Invalid argument";
3117+
#[cfg(target_os = "vxworks")]
3118+
let invalid_options = "invalid argument";
31173119

31183120
// Test various combinations of creation modes and access modes.
31193121
//

0 commit comments

Comments
 (0)