From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 17 Sep 2005 22:44:03 +0000 (+0000)
Subject: More POSIX 1003.1-2001 support: Replace test -a with &&.  Replace egrep
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~410
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad2ec8effa59412f3989a49930b6e16022d2082a;p=openldap

More POSIX 1003.1-2001 support: Replace test -a with &&.  Replace egrep
with $EGREP_CMD from configure.  (Renamed from configure's $EGREP just
in case egrep variants exist that use the EGREP environment variable.)
---

diff --git a/tests/run.in b/tests/run.in
index 2043d8fd68..2f1f2bb8ee 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -19,8 +19,9 @@ USAGE="$0 [-b <backend>] [-c] [-k] [-p] [-u] [-w] <script>"
 SRCDIR="@srcdir@"
 TOPSRCDIR="@top_srcdir@"
 LN_S="@LN_S@"
+EGREP_CMD="@EGREP@"
 
-export SRCDIR TOPSRCDIR LN_S
+export SRCDIR TOPSRCDIR LN_S EGREP_CMD
 
 # backends
 AC_bdb=@BUILD_BDB@
diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index b38993c61f..4b535b881d 100755
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" -a "$BACKEND" != "hdb" ; then
+if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
 	echo "Test does not support $BACKEND"
 	exit 0
 fi
@@ -67,7 +67,7 @@ fi
 echo "Searching unmodified database..."
 
 $LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	egrep "(manager|secretary):" | sed "s/george/foster/g" | \
+	$EGREP_CMD "(manager|secretary):" | sed "s/george/foster/g" | \
 	sort > $SEARCHOUT 2>&1
 
 RC=$?
@@ -93,7 +93,7 @@ fi
 echo "Using ldapsearch to check dependents new rdn..."
 
 $LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	egrep "(manager|secretary):" | sort > $SEARCHFLT 2>&1
+	$EGREP_CMD "(manager|secretary):" | sort > $SEARCHFLT 2>&1
 
 RC=$?
 	if test $RC != 0 ; then
@@ -127,7 +127,7 @@ fi
 
 echo "Using ldapsearch to verify dependents have been deleted..."
 $LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	egrep "(manager|secretary):" > $SEARCHFLT 2>&1
+	$EGREP_CMD "(manager|secretary):" > $SEARCHFLT 2>&1
 
 RC=$?
 if test $RC != 0 ; then