Use proxy cache overlay

diff --git a/tests/run.in b/tests/run.in
index 16e5a0a0f5ce63bb59bc314a1f35eede2fbaba73..e8b770d63a3046a67b0367a272ee249251d85f57 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -26,12 +26,11 @@ AC_bdb=@BUILD_BDB@
 AC_hdb=@BUILD_HDB@
 AC_ldbm=@BUILD_LDBM@
 AC_ldap=ldap@BUILD_LDAP@
-AC_meta=meta@BUILD_META@
+AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_MONITOR=@BUILD_MONITOR@
-AC_CACHE=@BUILD_CACHE@
 AC_WITH_TLS=@WITH_TLS@
 
-export AC_MONITOR AC_CACHE AC_WITH_TLS AC_ldap AC_meta
+export AC_MONITOR AC_WITH_TLS AC_ldap AC_pcache
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 07edf3022b946fc828678ef821088f19ce9ce923..a0afe697563d30bb8adf9757c9976706c884017d 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -14,7 +14,7 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MONITORDB=${AC_MONITOR-no}
-PROXYCACHE=${AC_CACHE-no}
+PROXYCACHE=${AC_pcache-pcacheno}
 WITHTLS=${AC_WITHTLS-yes}
 
 DATADIR=./testdata

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 38dddc43340c4364ff464af7c8ceb3c41cff4c6a..ddd294e9a436f30dc83e09b0fce5ea62755aa62b 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -18,8 +18,8 @@ CACHE_ENTRY_LIMIT=10
 
 . $SRCDIR/scripts/defines.sh
 
-if test $PROXYCACHE = no; then 
-       echo "Proxy caching requires back-meta AND (back-ldbm OR back-bdb)" 
+if test $PROXYCACHE = pcacheno; then 
+       echo "Proxy cache overlay not available, test skipped"
        exit 0
 fi