From cbff7b0892148b037581541184364e0e91d2a138 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 24 Jan 2013 22:59:16 +0000
Subject: tests: remove utee and use tee(1) instead

POSIX already stipulates tee(1) must be unbuffered.  I think my
decision to use utee was due to my being misled by a bug in
older curl where -N did not work as advertised (but --no-buffer
did).
---
 t/bin/utee                       | 12 ------------
 t/t0200-async-response.sh        |  6 +++---
 t/t0202-async-response-one-oh.sh |  6 +++---
 t/t0300-async_sinatra.sh         |  6 +++---
 4 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100755 t/bin/utee

(limited to 't')

diff --git a/t/bin/utee b/t/bin/utee
deleted file mode 100755
index 7b61fea..0000000
--- a/t/bin/utee
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# -*- encoding: binary -*-
-# tee(1) as distributed on most(all?) systems is buffered in luserspace
-# this only does unbuffered writes (with line-buffered input) to make
-# test output appear in real-time
-$stdin.binmode
-$stdout.binmode
-fp = File.open(ARGV.shift, "wb")
-$stdin.each_line do |line|
-  fp.syswrite line
-  $stdout.syswrite line
-end
diff --git a/t/t0200-async-response.sh b/t/t0200-async-response.sh
index 11917f0..7b2bc49 100755
--- a/t/t0200-async-response.sh
+++ b/t/t0200-async-response.sh
@@ -26,9 +26,9 @@ t_begin "setup and start" && {
 
 t_begin "send async requests off in parallel" && {
 	t0=$(date +%s)
-	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $a) &
-	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $b) &
-	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $c) &
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $a) &
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $b) &
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $c) &
 	wait
 	t1=$(date +%s)
 }
diff --git a/t/t0202-async-response-one-oh.sh b/t/t0202-async-response-one-oh.sh
index 80ffc1f..49b6cac 100755
--- a/t/t0202-async-response-one-oh.sh
+++ b/t/t0202-async-response-one-oh.sh
@@ -18,9 +18,9 @@ t_begin "setup and start" && {
 t_begin "send async requests off in parallel" && {
 	t0=$(date +%s)
 	curl="curl -0 --no-buffer -vsSf http://$listen/"
-	( $curl 2>> $a_err | utee $a) &
-	( $curl 2>> $b_err | utee $b) &
-	( $curl 2>> $c_err | utee $c) &
+	( $curl 2>> $a_err | tee $a) &
+	( $curl 2>> $b_err | tee $b) &
+	( $curl 2>> $c_err | tee $c) &
 	wait
 	t1=$(date +%s)
 }
diff --git a/t/t0300-async_sinatra.sh b/t/t0300-async_sinatra.sh
index a623916..ef612b8 100755
--- a/t/t0300-async_sinatra.sh
+++ b/t/t0300-async_sinatra.sh
@@ -25,9 +25,9 @@ t_begin "setup and start" && {
 
 t_begin "send async requests off in parallel" && {
 	t0=$(date +%s)
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $a) &
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $b) &
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $c) &
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $a) &
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $b) &
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $c) &
 }
 
 t_begin "ensure elapsed requests were processed in parallel" && {
-- 
cgit v1.2.3-24-ge0c7