From c60d3866c33243d2c186ba15e314eca791053f02 Mon Sep 17 00:00:00 2001
From: Chad Brewbaker <chad@flyingdogsolutions.com>
Date: Tue, 18 May 2021 15:10:51 -0500
Subject: [PATCH 1/3] dev random blocks on linux

---
 tests/by-util/test_cat.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs
index 67722daa2..6ec021ffa 100644
--- a/tests/by-util/test_cat.rs
+++ b/tests/by-util/test_cat.rs
@@ -347,10 +347,18 @@ fn test_squeeze_blank_before_numbering() {
 #[cfg(unix)]
 fn test_dev_random() {
     let mut buf = [0; 2048];
-    let mut proc = new_ucmd!().args(&["/dev/random"]).run_no_wait();
+    #[cfg(target_os = "linux")]
+    fn rand_gen() -> &'static str { "/dev/urandom"}
+
+    #[cfg(not(target_os = "linux"))]
+    fn rand_gen() -> &'static str { "/dev/random"}
+
+    let mut proc = new_ucmd!().args(&[rand_gen()]).run_no_wait();
     let mut proc_stdout = proc.stdout.take().unwrap();
+    println!("I got to 1");
     proc_stdout.read_exact(&mut buf).unwrap();
 
+    println!("I got to 3");
     let num_zeroes = buf.iter().fold(0, |mut acc, &n| {
         if n == 0 {
             acc += 1;

From a69cb11de9de0d51e679a78f4a1055d199d2915c Mon Sep 17 00:00:00 2001
From: Chad Brewbaker <chad@flyingdogsolutions.com>
Date: Tue, 18 May 2021 15:17:07 -0500
Subject: [PATCH 2/3] Removing debug code

---
 tests/by-util/test_cat.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs
index 6ec021ffa..997a7964c 100644
--- a/tests/by-util/test_cat.rs
+++ b/tests/by-util/test_cat.rs
@@ -355,10 +355,8 @@ fn test_dev_random() {
 
     let mut proc = new_ucmd!().args(&[rand_gen()]).run_no_wait();
     let mut proc_stdout = proc.stdout.take().unwrap();
-    println!("I got to 1");
     proc_stdout.read_exact(&mut buf).unwrap();
 
-    println!("I got to 3");
     let num_zeroes = buf.iter().fold(0, |mut acc, &n| {
         if n == 0 {
             acc += 1;

From 9167a4128da23f14831819bd2b6d89f624ab9cfb Mon Sep 17 00:00:00 2001
From: Chad Brewbaker <crb002@gmail.com>
Date: Wed, 19 May 2021 04:06:46 -0500
Subject: [PATCH 3/3] Update test_cat.rs

Refactored to constants
---
 tests/by-util/test_cat.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs
index 997a7964c..4bb673b95 100644
--- a/tests/by-util/test_cat.rs
+++ b/tests/by-util/test_cat.rs
@@ -348,12 +348,12 @@ fn test_squeeze_blank_before_numbering() {
 fn test_dev_random() {
     let mut buf = [0; 2048];
     #[cfg(target_os = "linux")]
-    fn rand_gen() -> &'static str { "/dev/urandom"}
+    const DEV_RANDOM: &str = "/dev/urandom";
 
     #[cfg(not(target_os = "linux"))]
-    fn rand_gen() -> &'static str { "/dev/random"}
+    const DEV_RANDOM: &str = "/dev/random";
 
-    let mut proc = new_ucmd!().args(&[rand_gen()]).run_no_wait();
+    let mut proc = new_ucmd!().args(&[DEV_RANDOM]).run_no_wait();
     let mut proc_stdout = proc.stdout.take().unwrap();
     proc_stdout.read_exact(&mut buf).unwrap();