Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 23 insertions, 0 deletions

diff --git a/tests/run-make/windows-spawn/Makefile b/tests/run-make/windows-spawn/Makefile
new file mode 100644
index 000000000..b6cdb169b
--- /dev/null
+++ b/tests/run-make/windows-spawn/Makefile
@@ -0,0 +1,8 @@
+include ../tools.mk
+
+# only-windows
+
+all:
+	$(RUSTC) -o "$(TMPDIR)/hopefullydoesntexist bar.exe" hello.rs
+	$(RUSTC) spawn.rs
+	$(TMPDIR)/spawn.exe
diff --git a/tests/run-make/windows-spawn/hello.rs b/tests/run-make/windows-spawn/hello.rs
new file mode 100644
index 000000000..47ad8c634
--- /dev/null
+++ b/tests/run-make/windows-spawn/hello.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello World!");
+}
diff --git a/tests/run-make/windows-spawn/spawn.rs b/tests/run-make/windows-spawn/spawn.rs
new file mode 100644
index 000000000..c34da3d5f
--- /dev/null
+++ b/tests/run-make/windows-spawn/spawn.rs
@@ -0,0 +1,12 @@
+use std::io::ErrorKind;
+use std::process::Command;
+
+fn main() {
+    // Make sure it doesn't try to run "hopefullydoesntexist bar.exe".
+    assert_eq!(Command::new("hopefullydoesntexist")
+                   .arg("bar")
+                   .spawn()
+                   .unwrap_err()
+                   .kind(),
+               ErrorKind::NotFound);
+}