Glue is back in core, not an overlay

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index c504790be92a8d039202fc5e0eb91df73589b076..a26622a23107cbed569efffaee7efb4e1396ea88 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -20,7 +20,6 @@ BACKRELAY=${AC_relay-relayno}
 BACKSQL=${AC_sql-sqlno}
 RDBMS=${SLAPD_USE_SQL-rdbmsno}
 RDBMSWRITE=${SLAPD_USE_SQLWRITE-no}
-GLUE=${AC_glue-glueno}
 PROXYCACHE=${AC_pcache-pcacheno}
 PPOLICY=${AC_ppolicy-ppolicyno}
 REFINT=${AC_refint-refintno}

diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index df6afa1d581fa6166bfd97106400af02c9be17ed..f87fe6df770f469b50079c5e251a341976f2d4ce 100755 (executable)
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -16,11 +16,6 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-if test $GLUE = glueno; then 
-       echo "Backend glue overlay not available, test skipped"
-       exit 0
-fi 
-
 mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR1C
 
 echo "Running slapadd to build glued slapd databases..."

diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index 085a005b4f9e472f364e9eafca598a358fd34e17..c45feec9d6d5fbf575aab78e988fb6e014f487e3 100755 (executable)
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -16,11 +16,6 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-if test $GLUE = glueno; then 
-       echo "Backend glue overlay not available, test skipped"
-       exit 0
-fi 
-
 mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR1C
 
 echo "Starting slapd on TCP/IP port $PORT..."