Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 32 insertions, 0 deletions

diff --git a/tests/ui/process-termination/process-termination-blocking-io.rs b/tests/ui/process-termination/process-termination-blocking-io.rs
new file mode 100644
index 000000000..b2dab5c93
--- /dev/null
+++ b/tests/ui/process-termination/process-termination-blocking-io.rs
@@ -0,0 +1,19 @@
+// program should terminate even if a thread is blocked on I/O.
+// https://github.com/fortanix/rust-sgx/issues/109
+
+// run-pass
+// ignore-emscripten no threads support
+
+use std::{net::TcpListener, sync::mpsc, thread};
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+    thread::spawn(move || {
+        let listen = TcpListener::bind("127.0.0.1:0").unwrap();
+        tx.send(()).unwrap();
+        while let Ok(_) = listen.accept() {}
+    });
+    rx.recv().unwrap();
+    for _ in 0..3 { thread::yield_now(); }
+    println!("Exiting main thread");
+}
diff --git a/tests/ui/process-termination/process-termination-simple.rs b/tests/ui/process-termination/process-termination-simple.rs
new file mode 100644
index 000000000..8f2e5b94c
--- /dev/null
+++ b/tests/ui/process-termination/process-termination-simple.rs
@@ -0,0 +1,13 @@
+// program should terminate when std::process::exit is called from any thread
+
+// run-pass
+// ignore-emscripten no threads support
+
+use std::{process, thread};
+
+fn main() {
+    let h = thread::spawn(|| {
+        process::exit(0);
+    });
+    let _ = h.join();
+}