From a1eb89568e50132339b5e8a1d5166fb5b5f9b0e8 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Sat, 5 Dec 2020 21:00:53 -0700
Subject: [PATCH] Handle SIGRT_1 in test_alarm

When run in Cirrus-CI's environment, the tests generate copious SIGRT_1
signals.  This commit ensures that test_alarm will ignore them.
---
 test/test_unistd.rs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/test_unistd.rs b/test/test_unistd.rs
index a4b8a91668..34f7f56140 100644
--- a/test/test_unistd.rs
+++ b/test/test_unistd.rs
@@ -684,6 +684,12 @@ pub extern fn alarm_signal_handler(raw_signal: libc::c_int) {
 #[test]
 #[cfg(not(target_os = "redox"))]
 fn test_alarm() {
+    use std::{
+        time::{Duration, Instant,},
+        thread
+    };
+
+    // Maybe other tests that fork interfere with this one?
     let _m = crate::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");
 
     let handler = SigHandler::Handler(alarm_signal_handler);
@@ -701,8 +707,16 @@ fn test_alarm() {
 
     // We should be woken up after 1 second by the alarm, so we'll sleep for 2
     // seconds to be sure.
-    sleep(2);
-    assert_eq!(unsafe { ALARM_CALLED }, true, "expected our alarm signal handler to be called");
+    let starttime = Instant::now();
+    loop {
+        thread::sleep(Duration::from_millis(100));
+        if unsafe { ALARM_CALLED} {
+            break;
+        }
+        if starttime.elapsed() > Duration::from_secs(3) {
+            panic!("Timeout waiting for SIGALRM");
+        }
+    }
 
     // Reset the signal.
     unsafe {