$OpenBSD: patch-t_test-lib_sh,v 1.1 2011/11/18 00:05:43 jeremy Exp $
--- t/test-lib.sh.orig	Thu Jan  1 01:00:00 1970
+++ t/test-lib.sh	Tue Nov 15 22:02:59 2011
@@ -38,20 +38,24 @@ rtmpfiles () {
 	for id in "$@"
 	do
 		name=$id
-		_tmp=$t_pfx.$id
-		eval "$id=$_tmp"
 
 		case $name in
 		*fifo)
+			_tmp=$t_pfx.$id
+			eval "$id=$_tmp"
 			rm -f $_tmp
 			mkfifo $_tmp
 			T_RM_LIST="$T_RM_LIST $_tmp"
 			;;
 		*socket)
+			_tmp=$(echo "$t_pfx.$id" | $RUBY -e 'print $stdin.read(103)')
+			eval "$id=$_tmp"
 			rm -f $_tmp
 			T_RM_LIST="$T_RM_LIST $_tmp"
 			;;
 		*)
+			_tmp=$t_pfx.$id
+			eval "$id=$_tmp"
 			> $_tmp
 			T_OK_RM_LIST="$T_OK_RM_LIST $_tmp"
 			;;
@@ -101,6 +105,7 @@ unicorn_wait_start () {
 
 rsha1 () {
 	_cmd="$(which sha1sum 2>/dev/null || :)"
+	test -n "$_cmd" || _cmd="$(which sha1 2>/dev/null || :) -q"
 	test -n "$_cmd" || _cmd="$(which openssl 2>/dev/null || :) sha1"
 	test "$_cmd" != " sha1" || _cmd="$(which gsha1sum 2>/dev/null || :)"
 
