From 615604f0c709e2b2e8edef2cf0b4418879b40aeb Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Wed, 22 Dec 2021 18:31:36 +0000 Subject: Fix tests --- library/std/src/process/tests.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'library/std/src/process') diff --git a/library/std/src/process/tests.rs b/library/std/src/process/tests.rs index 67b747e4107..61ab0eb55e6 100644 --- a/library/std/src/process/tests.rs +++ b/library/std/src/process/tests.rs @@ -4,6 +4,10 @@ use super::{Command, Output, Stdio}; use crate::io::ErrorKind; use crate::str; +fn known_command() -> Command { + if cfg!(windows) { Command::new("help") } else { Command::new("echo") } +} + #[cfg(target_os = "android")] fn shell_cmd() -> Command { Command::new("/system/bin/sh") @@ -305,7 +309,7 @@ fn test_interior_nul_in_progname_is_error() { #[test] fn test_interior_nul_in_arg_is_error() { - match Command::new("rustc").arg("has-some-\0\0s-inside").spawn() { + match known_command().arg("has-some-\0\0s-inside").spawn() { Err(e) => assert_eq!(e.kind(), ErrorKind::InvalidInput), Ok(_) => panic!(), } @@ -313,7 +317,7 @@ fn test_interior_nul_in_arg_is_error() { #[test] fn test_interior_nul_in_args_is_error() { - match Command::new("rustc").args(&["has-some-\0\0s-inside"]).spawn() { + match known_command().args(&["has-some-\0\0s-inside"]).spawn() { Err(e) => assert_eq!(e.kind(), ErrorKind::InvalidInput), Ok(_) => panic!(), } @@ -321,7 +325,7 @@ fn test_interior_nul_in_args_is_error() { #[test] fn test_interior_nul_in_current_dir_is_error() { - match Command::new("rustc").current_dir("has-some-\0\0s-inside").spawn() { + match known_command().current_dir("has-some-\0\0s-inside").spawn() { Err(e) => assert_eq!(e.kind(), ErrorKind::InvalidInput), Ok(_) => panic!(), } -- cgit 1.4.1-3-g733a5