Skip to content

Commit 63a4551

Browse files
authored
Rollup merge of #66165 - Wind-River:master_xyz, r=alexcrichton
Ignore these tests ,since the called commands doesn't exist in VxWorks
2 parents 1455381 + c965432 commit 63a4551

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

src/libstd/process.rs

+17-12
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ mod tests {
16611661
// FIXME(#10380) these tests should not all be ignored on android.
16621662

16631663
#[test]
1664-
#[cfg_attr(target_os = "android", ignore)]
1664+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
16651665
fn smoke() {
16661666
let p = if cfg!(target_os = "windows") {
16671667
Command::new("cmd").args(&["/C", "exit 0"]).spawn()
@@ -1683,7 +1683,7 @@ mod tests {
16831683
}
16841684

16851685
#[test]
1686-
#[cfg_attr(target_os = "android", ignore)]
1686+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
16871687
fn exit_reported_right() {
16881688
let p = if cfg!(target_os = "windows") {
16891689
Command::new("cmd").args(&["/C", "exit 1"]).spawn()
@@ -1698,7 +1698,7 @@ mod tests {
16981698

16991699
#[test]
17001700
#[cfg(unix)]
1701-
#[cfg_attr(target_os = "android", ignore)]
1701+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
17021702
fn signal_reported_right() {
17031703
use crate::os::unix::process::ExitStatusExt;
17041704

@@ -1726,7 +1726,7 @@ mod tests {
17261726
}
17271727

17281728
#[test]
1729-
#[cfg_attr(target_os = "android", ignore)]
1729+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
17301730
fn stdout_works() {
17311731
if cfg!(target_os = "windows") {
17321732
let mut cmd = Command::new("cmd");
@@ -1740,7 +1740,7 @@ mod tests {
17401740
}
17411741

17421742
#[test]
1743-
#[cfg_attr(any(windows, target_os = "android"), ignore)]
1743+
#[cfg_attr(any(windows, target_os = "android", target_os = "vxworks"), ignore)]
17441744
fn set_current_dir_works() {
17451745
let mut cmd = Command::new("/bin/sh");
17461746
cmd.arg("-c").arg("pwd")
@@ -1750,7 +1750,7 @@ mod tests {
17501750
}
17511751

17521752
#[test]
1753-
#[cfg_attr(any(windows, target_os = "android"), ignore)]
1753+
#[cfg_attr(any(windows, target_os = "android", target_os = "vxworks"), ignore)]
17541754
fn stdin_works() {
17551755
let mut p = Command::new("/bin/sh")
17561756
.arg("-c").arg("read line; echo $line")
@@ -1766,7 +1766,7 @@ mod tests {
17661766
}
17671767

17681768
#[test]
1769-
#[cfg_attr(target_os = "android", ignore)]
1769+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
17701770
fn test_process_status() {
17711771
let mut status = if cfg!(target_os = "windows") {
17721772
Command::new("cmd").args(&["/C", "exit 1"]).status().unwrap()
@@ -1792,7 +1792,7 @@ mod tests {
17921792
}
17931793

17941794
#[test]
1795-
#[cfg_attr(target_os = "android", ignore)]
1795+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
17961796
fn test_process_output_output() {
17971797
let Output {status, stdout, stderr}
17981798
= if cfg!(target_os = "windows") {
@@ -1808,7 +1808,7 @@ mod tests {
18081808
}
18091809

18101810
#[test]
1811-
#[cfg_attr(target_os = "android", ignore)]
1811+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
18121812
fn test_process_output_error() {
18131813
let Output {status, stdout, stderr}
18141814
= if cfg!(target_os = "windows") {
@@ -1823,7 +1823,7 @@ mod tests {
18231823
}
18241824

18251825
#[test]
1826-
#[cfg_attr(target_os = "android", ignore)]
1826+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
18271827
fn test_finish_once() {
18281828
let mut prog = if cfg!(target_os = "windows") {
18291829
Command::new("cmd").args(&["/C", "exit 1"]).spawn().unwrap()
@@ -1834,7 +1834,7 @@ mod tests {
18341834
}
18351835

18361836
#[test]
1837-
#[cfg_attr(target_os = "android", ignore)]
1837+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
18381838
fn test_finish_twice() {
18391839
let mut prog = if cfg!(target_os = "windows") {
18401840
Command::new("cmd").args(&["/C", "exit 1"]).spawn().unwrap()
@@ -1846,7 +1846,7 @@ mod tests {
18461846
}
18471847

18481848
#[test]
1849-
#[cfg_attr(target_os = "android", ignore)]
1849+
#[cfg_attr(any(target_os = "vxworks", target_os = "android"), ignore)]
18501850
fn test_wait_with_output_once() {
18511851
let prog = if cfg!(target_os = "windows") {
18521852
Command::new("cmd").args(&["/C", "echo hello"]).stdout(Stdio::piped()).spawn().unwrap()
@@ -1881,6 +1881,7 @@ mod tests {
18811881
}
18821882

18831883
#[test]
1884+
#[cfg_attr(target_os = "vxworks", ignore)]
18841885
fn test_override_env() {
18851886
use crate::env;
18861887

@@ -1901,6 +1902,7 @@ mod tests {
19011902
}
19021903

19031904
#[test]
1905+
#[cfg_attr(target_os = "vxworks", ignore)]
19041906
fn test_add_to_env() {
19051907
let result = env_cmd().env("RUN_TEST_NEW_ENV", "123").output().unwrap();
19061908
let output = String::from_utf8_lossy(&result.stdout).to_string();
@@ -1910,6 +1912,7 @@ mod tests {
19101912
}
19111913

19121914
#[test]
1915+
#[cfg_attr(target_os = "vxworks", ignore)]
19131916
fn test_capture_env_at_spawn() {
19141917
use crate::env;
19151918

@@ -1965,6 +1968,7 @@ mod tests {
19651968

19661969
// Regression tests for #30862.
19671970
#[test]
1971+
#[cfg_attr(target_os = "vxworks", ignore)]
19681972
fn test_interior_nul_in_env_key_is_error() {
19691973
match env_cmd().env("has-some-\0\0s-inside", "value").spawn() {
19701974
Err(e) => assert_eq!(e.kind(), ErrorKind::InvalidInput),
@@ -1973,6 +1977,7 @@ mod tests {
19731977
}
19741978

19751979
#[test]
1980+
#[cfg_attr(target_os = "vxworks", ignore)]
19761981
fn test_interior_nul_in_env_value_is_error() {
19771982
match env_cmd().env("key", "has-some-\0\0s-inside").spawn() {
19781983
Err(e) => assert_eq!(e.kind(), ErrorKind::InvalidInput),

0 commit comments

Comments
 (0)