diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-05-02 10:06:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:42 -0500 |
| commit | 78aa8f181469b24f7ad836c2b7b8629c33f9f6b0 (patch) | |
| tree | 2b54616a09ed675ec87031f71c7c51fa9c64c033 /source4/lib/ldb/tests | |
| parent | 9f084101dd392ceb85f141f55ee56bed344626ef (diff) | |
| download | samba-78aa8f181469b24f7ad836c2b7b8629c33f9f6b0.tar.gz samba-78aa8f181469b24f7ad836c2b7b8629c33f9f6b0.tar.bz2 samba-78aa8f181469b24f7ad836c2b7b8629c33f9f6b0.zip | |
r444: - added the beginnings of a ldb test suite and benchmark
- updated the test slapd config to use bdb and indexing
(This used to be commit 7ad0858c060ee212a33434dc4be75e7a0cd1a0e3)
Diffstat (limited to 'source4/lib/ldb/tests')
| -rwxr-xr-x | source4/lib/ldb/tests/init_slapd.sh | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/slapd.conf | 12 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/start_slapd.sh | 3 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/test-index.ldif | 3 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/test.ldif | 3 |
5 files changed, 13 insertions, 10 deletions
diff --git a/source4/lib/ldb/tests/init_slapd.sh b/source4/lib/ldb/tests/init_slapd.sh index 94dca71791..67eecb031c 100755 --- a/source4/lib/ldb/tests/init_slapd.sh +++ b/source4/lib/ldb/tests/init_slapd.sh @@ -1,6 +1,6 @@ #!/bin/sh -export PATH=/home/tridge/samba/openldap/prefix/sbin:/home/tridge/samba/openldap/prefix/bin:/home/tridge/samba/openldap/prefix/libexec:$PATH +export PATH=/usr/sbin:$PATH rm -rf tests/tmp/db mkdir -p tests/tmp/db diff --git a/source4/lib/ldb/tests/slapd.conf b/source4/lib/ldb/tests/slapd.conf index cb71eb3963..10d15b541c 100644 --- a/source4/lib/ldb/tests/slapd.conf +++ b/source4/lib/ldb/tests/slapd.conf @@ -14,12 +14,14 @@ access to * by * write allow update_anon bind_anon_dn +modulepath /usr/lib/ldap +moduleload back_bdb + defaultsearchbase "o=University of Michigan,c=US" -database ldbm +backend bdb +database bdb suffix "o=University of Michigan,c=US" directory tests/tmp/db - -index objectClass eq -index drink eq -index title eq +index objectClass eq +index uid eq diff --git a/source4/lib/ldb/tests/start_slapd.sh b/source4/lib/ldb/tests/start_slapd.sh index d000eec9a4..d03a0fca32 100755 --- a/source4/lib/ldb/tests/start_slapd.sh +++ b/source4/lib/ldb/tests/start_slapd.sh @@ -1,8 +1,7 @@ #!/bin/sh -export PATH=/home/tridge/samba/openldap/prefix/sbin:/home/tridge/samba/openldap/prefix/bin:/home/tridge/samba/openldap/prefix/libexec:$PATH +export PATH=/usr/sbin:$PATH mkdir -p tests/tmp/db slapd -f tests/slapd.conf -h "`tests/ldapi_url.sh`" $* - diff --git a/source4/lib/ldb/tests/test-index.ldif b/source4/lib/ldb/tests/test-index.ldif index fe9c79d1a2..0f1268c44f 100644 --- a/source4/lib/ldb/tests/test-index.ldif +++ b/source4/lib/ldb/tests/test-index.ldif @@ -1,4 +1,3 @@ dn: @INDEXLIST -@IDXATTR: drink -@IDXATTR: title +@IDXATTR: uid @IDXATTR: objectclass diff --git a/source4/lib/ldb/tests/test.ldif b/source4/lib/ldb/tests/test.ldif index 72d52a25f8..2d7e1f95de 100644 --- a/source4/lib/ldb/tests/test.ldif +++ b/source4/lib/ldb/tests/test.ldif @@ -414,3 +414,6 @@ pager: +1 313 555 2844 facsimiletelephonenumber: +1 313 555 9700 telephonenumber: +1 313 555 5331 +dn: ou=Ldb Test,ou=People,o=University of Michigan,c=US +objectclass: organizationalUnit +ou: Ldb Test |