$OpenBSD: patch-tests_test_rhash_sh,v 1.3 2017/08/14 12:20:57 dcoppa Exp $

Index: tests/test_rhash.sh
--- tests/test_rhash.sh.orig
+++ tests/test_rhash.sh
@@ -2,14 +2,12 @@
 
 if [ "$1" = "--full" ]; then FULL_TEST=1; shift; fi
 
-[ -x "$1" ] && rhash="$(cd ${1%/*} && echo $PWD/${1##*/})" || rhash="../rhash";
+[ -x "$1" ] && rhash="$(cd ${1%/*} && echo $PWD/${1##*/})" || rhash="../rhash_shared";
 cd $(dirname "$0") # chdir after getting absolute path of $1, but before checking for ../rhash
-[ -x "$rhash" ] || rhash="`which rhash`"
 if [ ! -x $rhash ]; then 
   echo "Fatal: $rhash not found"
   exit 1
 fi
-[ "$rhash" != "../rhash" ] && echo "Testing $rhash"
 
 #version="`$rhash -V|sed 's/^.* v//'`"
 HASHOPT="`$rhash --list-hashes|sed 's/ .*$//;/[^3]-/s/-\([0-9R]\)/\1/'|tr A-Z a-z`"
@@ -133,7 +131,7 @@ if [ "$FULL_TEST" = 1 ]; then
   errors=0
   for opt in $HASHOPT ; do
     TEST_RESULT=$( printf "a" | $rhash --$opt --simple - )
-    match "$TEST_RESULT" "\b[0-9a-z]\{8,128\}\b" . || errors=$((errors+1))
+    match "$TEST_RESULT" "[[:<:]][0-9a-z]\{8,128\}[[:>:]]" . || errors=$((errors+1))
   done
   check $errors 0
 fi
