s4:lib/ldb: call ldb utils always via $VALGRIND ldbfoo$EXEEXT in the tests

metze

1 files changed, 17 insertions, 17 deletions

diff --git a/source4/lib/ldb/tests/test-tdb-features.sh b/source4/lib/ldb/tests/test-tdb-features.sh
index fc0959c54a..d4248366ca 100644
--- a/source4/lib/ldb/tests/test-tdb-features.sh
+++ b/source4/lib/ldb/tests/test-tdb-features.sh
@@ -7,17 +7,17 @@ mv $LDB_URL $LDB_URL.2
 checkcount() {
     count=$1
     expression="$2"
-    n=`bin/ldbsearch "$expression" | grep '^dn' | wc -l`
+    n=`$VALGRIND ldbsearch$EXEEXT "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
 	echo "Got $n but expected $count for $expression"
-	$VALGRIND bin/ldbsearch "$expression"
+	$VALGRIND ldbsearch$EXEEXT "$expression"
 	exit 1
     fi
     echo "OK: $count $expression"
 }
 
 echo "Testing case sensitive search"
-cat <<EOF | $VALGRIND bin/ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: cn=t1,cn=TEST
 objectClass: testclass
 test: foo
@@ -27,20 +27,20 @@ checkcount 0 '(test=FOO)'
 checkcount 0 '(test=FO*)'
 
 echo "Making case insensitive"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @ATTRIBUTES
 changetype: add
 add: test
 test: CASE_INSENSITIVE
 EOF
 
-echo $ldif | $VALGRIND bin/ldbmodify || exit 1
+echo $ldif | $VALGRIND ldbmodify$EXEEXT || exit 1
 checkcount 1 '(test=foo)'
 checkcount 1 '(test=FOO)'
 checkcount 1 '(test=fo*)'
 
 echo "adding i"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: cn=t1,cn=TEST
 changetype: modify
 add: i
@@ -50,7 +50,7 @@ checkcount 1 '(i=0x100)'
 checkcount 0 '(i=256)'
 
 echo "marking i as INTEGER"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @ATTRIBUTES
 changetype: modify
 add: i
@@ -60,7 +60,7 @@ checkcount 1 '(i=0x100)'
 checkcount 1 '(i=256)'
 
 echo "adding j"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: cn=t1,cn=TEST
 changetype: modify
 add: j
@@ -70,7 +70,7 @@ checkcount 1 '(j=0x100)'
 checkcount 0 '(j=256)'
 
 echo "Adding wildcard attribute"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @ATTRIBUTES
 changetype: modify
 add: *
@@ -84,7 +84,7 @@ checkcount 0 '(objectClass=otherclass)'
 checkcount 1 '(objectClass=testclass)'
 
 echo "Adding index"
-cat <<EOF | $VALGRIND bin/ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: @INDEXLIST
 @IDXATTR: i
 @IDXATTR: test
@@ -97,7 +97,7 @@ checkcount 1 '(test=FOO)'
 checkcount 1 '(test=*f*o)'
 
 echo "making test case sensitive"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @ATTRIBUTES
 changetype: modify
 replace: test
@@ -111,17 +111,17 @@ checkone() {
     count=$1
     base="$2"
     expression="$3"
-    n=`bin/ldbsearch -s one -b "$base" "$expression" | grep '^dn' | wc -l`
+    n=`$VALGRIND ldbsearch$EXEEXT -s one -b "$base" "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
 	echo "Got $n but expected $count for $expression"
-	$VALGRIND bin/ldbsearch -s one -b "$base" "$expression"
+	$VALGRIND ldbsearch$EXEEXT -s one -b "$base" "$expression"
 	exit 1
     fi
     echo "OK: $count $expression"
 }
 
 echo "Removing wildcard attribute"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @ATTRIBUTES
 changetype: modify
 delete: *
@@ -129,7 +129,7 @@ delete: *
 EOF
 
 echo "Adding one level indexes"
-cat <<EOF | $VALGRIND bin/ldbmodify || exit 1
+cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
 dn: @INDEXLIST
 changetype: modify
 add: @IDXONE
@@ -137,14 +137,14 @@ add: @IDXONE
 EOF
 
 echo "Testing one level indexed search"
-cat <<EOF | $VALGRIND bin/ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: cn=one,cn=t1,cn=TEST
 objectClass: oneclass
 cn: one
 test: one
 EOF
 checkone 1 "cn=t1,cn=TEST" '(test=one)'
-cat <<EOF | $VALGRIND bin/ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: cn=two,cn=t1,cn=TEST
 objectClass: oneclass
 cn: two