more pcache testing fixes import

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 344907a13f7ba2360323139207afc54474df3a64..e6799dea7720a23c30b5924f04ce1a250b37afaf 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -14,6 +14,7 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MONITORDB=${AC_MONITOR-no}
+BACKLDAP=${AC_ldap-ldapno}
 PROXYCACHE=${AC_pcache-pcacheno}
 WITHTLS=${AC_WITHTLS-yes}
 

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 83bc617e8734dcf195459678c291af466423c0bb..e1579a139c669edbb1d5a6096f8d9b744ea46693 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -23,6 +23,11 @@ if test $PROXYCACHE = pcacheno; then
        exit 0
 fi 
 
+if test $BACKLDAP = "ldapno" ; then 
+       echo "LDAP backend not available, test skipped"
+       exit 0
+fi 
+
 if test "x$LVL" = "x0" ; then
        echo "test020 needs a minimal log level; setting to LDAP_DEBUG_NONE..."
        LVL=2048