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

diff --git a/tests/scripts/test067-tls b/tests/scripts/test067-tls
index d85eadaca13454f7807c1dc77cedb1f9fbcebf03..b4483261a5664be7298cd0e65b27671e882ec389 100755 (executable)
--- 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 1e351d5f97f74e9cf522df65c5fca131b48cb637..976dc16690321e24623b345217897bd394c46a87 100755 (executable)
--- 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 dbf21443370e93a3e54ef39197c2745911a31300..576077d8e84b5ac2fb7cc161cd7d2d5366c5661f 100755 (executable)
--- 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