From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 3 Sep 2020 18:10:30 +0000 (+0000)
Subject: ITS#9209 - Use portable command instead of which for determining if binaries are... 
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce23aee98dff2cadba6ccf5a8df97777be0f7b00;p=thirdparty%2Fopenldap.git

ITS#9209 - Use portable command instead of which for determining if binaries are present
---

diff --git a/tests/scripts/test067-tls b/tests/scripts/test067-tls
index d85eadaca1..b4483261a5 100755
--- a/tests/scripts/test067-tls
+++ b/tests/scripts/test067-tls
@@ -21,9 +21,9 @@ if test $WITH_TLS = no ; then
         exit 0
 fi
 
-openssl="$(which openssl 2>/dev/null)"
-certtool="$(which certtool 2>/dev/null)"
-base64="$(which base64 2>/dev/null)"
+openssl="$(command -v openssl 2>/dev/null)"
+certtool="$(command -v certtool 2>/dev/null)"
+base64="$(command -v base64 2>/dev/null)"
 
 mkdir -p $TESTDIR $DBDIR1
 cp -r $DATADIR/tls $TESTDIR
diff --git a/tests/scripts/test072-dsee-sync b/tests/scripts/test072-dsee-sync
index 1e351d5f97..976dc16690 100755
--- a/tests/scripts/test072-dsee-sync
+++ b/tests/scripts/test072-dsee-sync
@@ -16,7 +16,8 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-if test ! "`which dsadm`"; then
+DSADM=`command -v dsadm`
+if test -z "$DSADM"; then
 	echo "DSEE dsadm not in path, test skipped"
 	exit 0
 fi 
diff --git a/tests/scripts/test075-dsee-persist b/tests/scripts/test075-dsee-persist
index dbf2144337..576077d8e8 100755
--- a/tests/scripts/test075-dsee-persist
+++ b/tests/scripts/test075-dsee-persist
@@ -18,7 +18,8 @@ echo "running defines.sh"
 
 OPATTRS="creatorsName createTimestamp modifiersName modifyTimestamp"
 
-if test ! "`which dsadm`"; then
+DSADM=`command -v dsadm`
+if test -z "$DSADM"; then
 	echo "DSEE dsadm not in path, test skipped"
 	exit 0
 fi