From fc336590dc35f1737ddc74333b959bdd32ee22d3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 May 2010 10:41:43 +0200 Subject: Remove the copy of ldb from Samba 3. There were two utility functions that other parts of Samba 3 still relied on; they have been moved to lib/ldb_compat.[ch]. --- source3/lib/ldb/tests/init.ldif | 40 -- source3/lib/ldb/tests/init_slapd.sh | 41 -- source3/lib/ldb/tests/kill_slapd.sh | 12 - source3/lib/ldb/tests/ldapi_url.sh | 11 - source3/lib/ldb/tests/photo.ldif | 5 - source3/lib/ldb/tests/samba4.png | Bin 6239 -> 0 bytes .../ldb/tests/schema-tests/schema-add-test.ldif | 66 ---- .../ldb/tests/schema-tests/schema-mod-test-1.ldif | 5 - .../ldb/tests/schema-tests/schema-mod-test-2.ldif | 5 - .../ldb/tests/schema-tests/schema-mod-test-3.ldif | 5 - .../ldb/tests/schema-tests/schema-mod-test-4.ldif | 5 - .../ldb/tests/schema-tests/schema-mod-test-5.ldif | 5 - source3/lib/ldb/tests/schema-tests/schema.ldif | 112 ------ source3/lib/ldb/tests/slapd.conf | 26 -- source3/lib/ldb/tests/start_slapd.sh | 14 - source3/lib/ldb/tests/test-attribs.ldif | 15 - source3/lib/ldb/tests/test-config.ldif | 67 ---- source3/lib/ldb/tests/test-default-config.ldif | 17 - source3/lib/ldb/tests/test-extended.sh | 69 ---- source3/lib/ldb/tests/test-generic.sh | 128 ------- source3/lib/ldb/tests/test-index.ldif | 11 - source3/lib/ldb/tests/test-ldap.sh | 54 --- source3/lib/ldb/tests/test-modify.ldif | 23 -- source3/lib/ldb/tests/test-schema.sh | 34 -- source3/lib/ldb/tests/test-sqlite3.sh | 25 -- source3/lib/ldb/tests/test-tdb-features.sh | 119 ------ source3/lib/ldb/tests/test-tdb.sh | 31 -- source3/lib/ldb/tests/test-wildcard.ldif | 5 - source3/lib/ldb/tests/test-wrong_attributes.ldif | 3 - source3/lib/ldb/tests/test.ldif | 411 --------------------- source3/lib/ldb/tests/testdata.txt | 8 - source3/lib/ldb/tests/testsearch.txt | 5 - 32 files changed, 1377 deletions(-) delete mode 100644 source3/lib/ldb/tests/init.ldif delete mode 100755 source3/lib/ldb/tests/init_slapd.sh delete mode 100755 source3/lib/ldb/tests/kill_slapd.sh delete mode 100755 source3/lib/ldb/tests/ldapi_url.sh delete mode 100644 source3/lib/ldb/tests/photo.ldif delete mode 100644 source3/lib/ldb/tests/samba4.png delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-add-test.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif delete mode 100644 source3/lib/ldb/tests/schema-tests/schema.ldif delete mode 100644 source3/lib/ldb/tests/slapd.conf delete mode 100755 source3/lib/ldb/tests/start_slapd.sh delete mode 100644 source3/lib/ldb/tests/test-attribs.ldif delete mode 100644 source3/lib/ldb/tests/test-config.ldif delete mode 100644 source3/lib/ldb/tests/test-default-config.ldif delete mode 100755 source3/lib/ldb/tests/test-extended.sh delete mode 100755 source3/lib/ldb/tests/test-generic.sh delete mode 100644 source3/lib/ldb/tests/test-index.ldif delete mode 100755 source3/lib/ldb/tests/test-ldap.sh delete mode 100644 source3/lib/ldb/tests/test-modify.ldif delete mode 100755 source3/lib/ldb/tests/test-schema.sh delete mode 100755 source3/lib/ldb/tests/test-sqlite3.sh delete mode 100644 source3/lib/ldb/tests/test-tdb-features.sh delete mode 100755 source3/lib/ldb/tests/test-tdb.sh delete mode 100644 source3/lib/ldb/tests/test-wildcard.ldif delete mode 100644 source3/lib/ldb/tests/test-wrong_attributes.ldif delete mode 100644 source3/lib/ldb/tests/test.ldif delete mode 100644 source3/lib/ldb/tests/testdata.txt delete mode 100644 source3/lib/ldb/tests/testsearch.txt (limited to 'source3/lib/ldb/tests') diff --git a/source3/lib/ldb/tests/init.ldif b/source3/lib/ldb/tests/init.ldif deleted file mode 100644 index 2e0b83c769..0000000000 --- a/source3/lib/ldb/tests/init.ldif +++ /dev/null @@ -1,40 +0,0 @@ -dn: o=University of Michigan,c=TEST -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -seeAlso: -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - -dn: ou=People,o=University of Michigan,c=TEST -objectclass: organizationalUnit -objectclass: extensibleObject -ou: People -uidNumber: 0 -gidNumber: 0 - -dn: ou=Ldb Test,ou=People,o=University of Michigan,c=TEST -objectclass: organizationalUnit -objectclass: extensibleObject -ou: People -ou: Ldb Test -uidNumber: 0 -gidNumber: 0 - -dn: ou=LdbTspace,ou=People,o=University of Michigan,c=TEST -objectclass: organizationalUnit -objectclass: extensibleObject -ou: People -ou: LdbTspace -description: test white space removal in comparisons -uidNumber: 0 -gidNumber: 0 diff --git a/source3/lib/ldb/tests/init_slapd.sh b/source3/lib/ldb/tests/init_slapd.sh deleted file mode 100755 index cf06acd08b..0000000000 --- a/source3/lib/ldb/tests/init_slapd.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -if [ -z "$LDBDIR" ]; then - LDBDIR=`dirname $0`/.. - export LDBDIR -fi - -rm -rf tests/tmp/db -mkdir -p tests/tmp/db - -if [ -f tests/tmp/slapd.pid ]; then - kill `cat tests/tmp/slapd.pid` - sleep 1 -fi -if [ -f tests/tmp/slapd.pid ]; then - kill -9 `cat tests/tmp/slapd.pid` - rm -f tests/tmp/slapd.pid -fi - -# we don't consider a slapadd failure as a test suite failure, as it -# has nothing to do with ldb - -MODCONF=tests/tmp/modules.conf -rm -f $MODCONF -touch $MODCONF || exit 1 - -slaptest -u -f $LDBDIR/tests/slapd.conf > /dev/null 2>&1 || { - echo "enabling sladp modules" -cat > $MODCONF <