diff options
author | Simo Sorce <idra@samba.org> | 2005-07-02 17:30:03 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:06 -0500 |
commit | 1c5105065a44173667de2a022dd2417e56b527d6 (patch) | |
tree | 165be48497b07108926b29cc9b9e94f79ab9632d /source4/lib/ldb/tests | |
parent | 2e419725b0e7b4dcb43340ae93ae7bb60b4a5597 (diff) | |
download | samba-1c5105065a44173667de2a022dd2417e56b527d6.tar.gz samba-1c5105065a44173667de2a022dd2417e56b527d6.tar.xz samba-1c5105065a44173667de2a022dd2417e56b527d6.zip |
r8082: large rewite of ldb_dn.c
- we do not support multpiple attribute components anymore, makes code a lot easier
they will be readded later if we found out they are really used, so far my tests
show w2k3 do not handle them as well
- fix escaping issues, move component value to be in an ldb_val structure
still need to handle binary values case
- make cononicalize functions leak less memory by giving a specific memory context
- fix tests scripts so that test-ldap can start
- make test not delete databases on completion so that I can inspect them
(This used to be commit 624a73148d125690ce18515f19231d26df207738)
Diffstat (limited to 'source4/lib/ldb/tests')
-rwxr-xr-x | source4/lib/ldb/tests/test-extended.sh | 3 | ||||
-rwxr-xr-x | source4/lib/ldb/tests/test-ldap.sh | 16 | ||||
-rw-r--r-- | source4/lib/ldb/tests/test-tdb-features.sh | 3 | ||||
-rwxr-xr-x | source4/lib/ldb/tests/test-tdb.sh | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/source4/lib/ldb/tests/test-extended.sh b/source4/lib/ldb/tests/test-extended.sh index 0bcb3ebcaac..c3958cf01ca 100755 --- a/source4/lib/ldb/tests/test-extended.sh +++ b/source4/lib/ldb/tests/test-extended.sh @@ -2,7 +2,7 @@ echo "Running extended search tests" -rm -f $LDB_URL +mv $LDB_URL $LDB_URL.1 cat <<EOF | bin/ldbadd || exit 1 dn: cn=testrec1,cn=TEST @@ -67,4 +67,3 @@ checkcount 1 '(i1:1.2.840.113556.1.4.804:=8388608)' # this is one that w2k gives checkcount 3 '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))' -rm -f $LDB_URL diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh index 4fcd328cad7..d9fa73b641c 100755 --- a/source4/lib/ldb/tests/test-ldap.sh +++ b/source4/lib/ldb/tests/test-ldap.sh @@ -24,9 +24,17 @@ for f in $SCHEMA_NEEDED; do fi done -tests/init_slapd.sh -tests/start_slapd.sh - export LDB_URL=`tests/ldapi_url.sh` -. tests/test-generic.sh +PATH=bin:$PATH +export PATH + +if [ -z "$LDBDIR" ]; then + LDBDIR="." + export LDBDIR +fi + +. $LDBDIR/tests/init_slapd.sh +. $LDBDIR/tests/start_slapd.sh + +. $LDBDIR/tests/test-generic.sh diff --git a/source4/lib/ldb/tests/test-tdb-features.sh b/source4/lib/ldb/tests/test-tdb-features.sh index a78d2d3dd56..613afef8ad2 100644 --- a/source4/lib/ldb/tests/test-tdb-features.sh +++ b/source4/lib/ldb/tests/test-tdb-features.sh @@ -2,7 +2,7 @@ echo "Running tdb feature tests" -rm -f $LDB_URL +mv $LDB_URL $LDB_URL.2 checkcount() { count=$1 @@ -128,4 +128,3 @@ checkcount 1 '(test=foo)' checkcount 0 '(test=FOO)' checkcount 0 '(test=fo*)' -rm -f $LDB_URL diff --git a/source4/lib/ldb/tests/test-tdb.sh b/source4/lib/ldb/tests/test-tdb.sh index 3d461b0b3fd..936c4487576 100755 --- a/source4/lib/ldb/tests/test-tdb.sh +++ b/source4/lib/ldb/tests/test-tdb.sh @@ -7,6 +7,8 @@ PATH=bin:$PATH export PATH rm -f tdbtest.ldb +rm -f tdbtest.ldb.1 +rm -f tdbtest.ldb.2 if [ -z "$LDBDIR" ]; then LDBDIR="." |