From 82e6b94b7d128d8d7c028a106fe3403ac111eed3 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 4 Dec 2004 19:43:22 +0000 Subject: [PATCH] Delete backglue in favor of glue overlay --- tests/data/slapd-glue.conf | 6 +- tests/data/test-glued.ldif | 102 ++++++++++++++-------------- tests/run.in | 3 +- tests/scripts/defines.sh | 1 + tests/scripts/test011-glue-slapadd | 5 ++ tests/scripts/test012-glue-populate | 5 ++ 6 files changed, 68 insertions(+), 54 deletions(-) diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf index b92bda4f2d..bdf1099edf 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -26,6 +26,7 @@ argsfile ./testrun/slapd.1.args #mod#moduleload back_@BACKEND@.la #monitormod#modulepath ../servers/slapd/back-monitor/ #monitormod#moduleload back_monitor.la +#gluemod#moduleload ../servers/slapd/overlays/glue.la ####################################################################### # database definitions @@ -33,7 +34,6 @@ argsfile ./testrun/slapd.1.args database @BACKEND@ suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" -subordinate directory ./testrun/db.1.a rootdn "cn=Manager, dc=example,dc=com" #ldbm#index objectclass eq @@ -47,7 +47,6 @@ rootdn "cn=Manager, dc=example,dc=com" database @BACKEND@ suffix "ou=Groups,dc=example,dc=com" -subordinate directory ./testrun/db.1.b rootdn "cn=Manager, dc=example,dc=com" #ldbm#index objectclass eq @@ -72,5 +71,8 @@ rootpw secret #bdb#index objectclass eq #bdb#index uid pres,eq,sub #bdb#index cn,sn pres,eq,sub,subany +overlay glue +glue-sub "ou=Information Technology Division,ou=People,dc=example,dc=com" +glue-sub "ou=Groups,dc=example,dc=com" #monitor#database monitor diff --git a/tests/data/test-glued.ldif b/tests/data/test-glued.ldif index eabb0c562e..7032b4db04 100644 --- a/tests/data/test-glued.ldif +++ b/tests/data/test-glued.ldif @@ -137,6 +137,57 @@ pager: +1 313 555 2844 facsimileTelephoneNumber: +1 313 555 9700 telephoneNumber: +1 313 555 5331 +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com +cn: All Staff +description: Everyone in the sample data +objectClass: groupOfNames + +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com +description: All Alumni Assoc Staff +cn: Alumni Assoc Staff +objectClass: groupOfNames + +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com +description: All ITD Staff +cn: ITD Staff +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com + dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectClass: organizationalUnit ou: Information Technology Division @@ -357,54 +408,3 @@ pager: +1 313 555 6573 facsimileTelephoneNumber: +1 313 555 4544 telephoneNumber: +1 313 555 9394 -dn: ou=Groups,dc=example,dc=com -objectClass: organizationalUnit -ou: Groups - -dn: cn=All Staff,ou=Groups,dc=example,dc=com -member: cn=Manager,dc=example,dc=com -member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam - ple,dc=com -member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc - =com -member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa - mple,dc=com -member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl - e,dc=com -owner: cn=Manager,dc=example,dc=com -cn: All Staff -description: Everyone in the sample data -objectClass: groupOfNames - -dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com -member: cn=Manager,dc=example,dc=com -member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com -member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com -owner: cn=Manager,dc=example,dc=com -description: All Alumni Assoc Staff -cn: Alumni Assoc Staff -objectClass: groupOfNames - -dn: cn=ITD Staff,ou=Groups,dc=example,dc=com -owner: cn=Manager,dc=example,dc=com -description: All ITD Staff -cn: ITD Staff -objectClass: groupOfUniqueNames -uniqueMember: cn=Manager,dc=example,dc=com -uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= - example,dc=com -uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - dc=example,dc=com -uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam - ple,dc=com - diff --git a/tests/run.in b/tests/run.in index 49b9dd89b8..e0ecc26fa4 100644 --- a/tests/run.in +++ b/tests/run.in @@ -32,6 +32,7 @@ AC_relay=relay@BUILD_RELAY@ AC_sql=sql@BUILD_SQL@ # overlays +AC_glue=glue@BUILD_GLUE@ AC_pcache=pcache@BUILD_PROXYCACHE@ AC_ppolicy=ppolicy@BUILD_PPOLICY@ AC_refint=refint@BUILD_REFINT@ @@ -45,7 +46,7 @@ AC_WITH_TLS=@WITH_TLS@ AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@ export AC_bdb AC_hdb AC_ldap AC_ldbm AC_monitor AC_relay AC_sql -export AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm AC_syncprov +export AC_glue AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm AC_syncprov export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED if test ! -x ../servers/slapd/slapd ; then diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index fe7274fca2..9b84904df9 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -19,6 +19,7 @@ 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 e7353bdc3c..e4762a293b 100755 --- a/tests/scripts/test011-glue-slapadd +++ b/tests/scripts/test011-glue-slapadd @@ -16,6 +16,11 @@ 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 4329826def..f1c6c2fa14 100755 --- a/tests/scripts/test012-glue-populate +++ b/tests/scripts/test012-glue-populate @@ -16,6 +16,11 @@ 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..." -- 2.39.5