tests: Use ldbsearch '--scope instead of '-s'

[gd/samba-autobuild/.git] / lib / ldb / tests / test-tdb-features.sh

diff --git a/lib/ldb/tests/test-tdb-features.sh b/lib/ldb/tests/test-tdb-features.sh
index 59e61ee5d2e380c45e7d84d18c2faf710c4f5644..5b2e9df6efcd162f494e18a4d6acd82becd1434f 100644 (file)
--- a/lib/ldb/tests/test-tdb-features.sh
+++ b/lib/ldb/tests/test-tdb-features.sh
@@ -4,6 +4,11 @@ echo "Running tdb feature tests"
 
 mv $LDB_URL $LDB_URL.2
 
+cat <<EOF | $VALGRIND ldbadd || exit 1
+dn: @MODULES
+@LIST: rdn_name
+EOF
+
 checkcount() {
     count=$1
     expression="$2"
@@ -25,6 +30,7 @@ EOF
 checkcount 1 '(test=foo)'
 checkcount 0 '(test=FOO)'
 checkcount 0 '(test=FO*)'
+checkcount 1 '(cn=t1)'
 
 echo "Making case insensitive"
 cat <<EOF | $VALGRIND ldbmodify || exit 1
@@ -79,6 +85,13 @@ EOF
 checkcount 1 '(j=0x100)'
 checkcount 1 '(j=256)'
 
+cat <<EOF | $VALGRIND ldbadd || exit 1
+dn: num=1
+EOF
+
+echo "Testing search for attribute after change to use wildcard"
+checkcount 1 '(num=1)'
+
 echo "Testing class search"
 checkcount 0 '(objectClass=otherclass)'
 checkcount 1 '(objectClass=testclass)'
@@ -111,10 +124,10 @@ checkone() {
     count=$1
     base="$2"
     expression="$3"
-    n=`$VALGRIND ldbsearch -s one -b "$base" "$expression" | grep '^dn' | wc -l`
+    n=`$VALGRIND ldbsearch --scope=one -b "$base" "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
        echo "Got $n but expected $count for $expression"
-       $VALGRIND ldbsearch -s one -b "$base" "$expression"
+       $VALGRIND ldbsearch --scope=one -b "$base" "$expression"
        exit 1
     fi
     echo "OK: $count $expression"