From 00b4da477456e921ec5315a09f9ff8da7d478580 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 21 Jan 2010 01:17:09 +0000 Subject: [PATCH] Fix testsuite behaviour on OpenSolaris /bin/sh. --- test/check-utils | 8 ++++---- test/functions.inc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/check-utils b/test/check-utils index 5399eb7..40a8a26 100755 --- a/test/check-utils +++ b/test/check-utils @@ -13,10 +13,10 @@ . "$(dirname "$0")/functions.inc" -HAVE_GETLINE=$("$ZZCAT" -l | grep -q '^ getline(' && echo "y") -HAVE_GETDELIM=$("$ZZCAT" -l | grep -q '^ getdelim(' && echo "y") -HAVE_GETC_UNLOCKED=$("$ZZCAT" -l | grep -q '^ getc_unlocked(' && echo "y") -HAVE_FGETC_UNLOCKED=$("$ZZCAT" -l | grep -q '^ fgetc_unlocked(' && echo "y") +HAVE_GETLINE=$("$ZZCAT" -l | grep >/dev/null 2>&1 '^ getline(' && echo "y") +HAVE_GETDELIM=$("$ZZCAT" -l | grep >/dev/null 2>&1 '^ getdelim(' && echo "y") +HAVE_GETC_UNLOCKED=$("$ZZCAT" -l | grep >/dev/null 2>&1 '^ getc_unlocked(' && echo "y") +HAVE_FGETC_UNLOCKED=$("$ZZCAT" -l | grep >/dev/null 2>&1 '^ fgetc_unlocked(' && echo "y") checkutils() { diff --git a/test/functions.inc b/test/functions.inc index 20328d1..6bb5a56 100644 --- a/test/functions.inc +++ b/test/functions.inc @@ -13,7 +13,7 @@ # DIR="$(dirname "$0")" -ZZUF="$DIR/../src/zzuf -E '[.]ilist$'" +ZZUF="$DIR/../src/zzuf -E [.]ilist$" ZZCAT="$DIR/../src/zzcat" if [ ! -f "$ZZCAT" ]; then