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

metze

4 files changed, 56 insertions, 56 deletions

diff --git a/source4/lib/ldb/tests/test-extended.sh b/source4/lib/ldb/tests/test-extended.sh
index a84e3b78a3..14b988e3f9 100755
--- a/source4/lib/ldb/tests/test-extended.sh
+++ b/source4/lib/ldb/tests/test-extended.sh
@@ -4,7 +4,7 @@ echo "Running extended search tests"
 
 mv $LDB_URL $LDB_URL.1
 
-cat <<EOF | bin/ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: cn=testrec1,cn=TEST
 i1: 1
 i2: 0
@@ -38,10 +38,10 @@ EOF
 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"
-	bin/ldbsearch "$expression"
+	$VALGRIND ldbsearch$EXEEXT "$expression"
 	exit 1
     fi
     echo "OK: $count $expression"
diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh
index 50b5ff99a0..fec4b5b078 100755
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/source4/lib/ldb/tests/test-generic.sh
@@ -8,73 +8,73 @@ fi
 echo "LDB_URL: $LDB_URL"
 
 echo "Adding base elements"
-$VALGRIND ldbadd $LDBDIR/tests/test.ldif || exit 1
+$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif || exit 1
 
 echo "Adding again - should fail"
-ldbadd $LDBDIR/tests/test.ldif 2> /dev/null && {
+$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif 2> /dev/null && {
     echo "Should have failed to add again - gave $?"
     exit 1
 }
 
 echo "Modifying elements"
-$VALGRIND ldbmodify $LDBDIR/tests/test-modify.ldif || exit 1
+$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/test-modify.ldif || exit 1
 
 echo "Showing modified record"
-$VALGRIND ldbsearch '(uid=uham)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(uid=uham)'  || exit 1
 
 echo "Rename entry"
 OLDDN="cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST"
 NEWDN="cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST"
-$VALGRIND ldbrename "$OLDDN" "$NEWDN"  || exit 1
+$VALGRIND ldbrename$EXEEXT "$OLDDN" "$NEWDN"  || exit 1
 
 echo "Showing renamed record"
-$VALGRIND ldbsearch '(uid=uham)' || exit 1
+$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
 
 echo "Starting ldbtest"
-$VALGRIND ldbtest --num-records 100 --num-searches 10  || exit 1
+$VALGRIND ldbtest$EXEEXT --num-records 100 --num-searches 10  || exit 1
 
 if [ $LDB_SPECIALS = 1 ]; then
  echo "Adding index"
- $VALGRIND ldbadd $LDBDIR/tests/test-index.ldif  || exit 1
+ $VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-index.ldif  || exit 1
 fi
 
 echo "Adding bad attributes - should fail"
-$VALGRIND ldbadd $LDBDIR/tests/test-wrong_attributes.ldif && {
+$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wrong_attributes.ldif && {
     echo "Should fhave failed - gave $?"
     exit 1
 }
 
 echo "testing indexed search"
-$VALGRIND ldbsearch '(uid=uham)'  || exit 1
-$VALGRIND ldbsearch '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1
-$VALGRIND ldbsearch '(&(uid=uham)(uid=uham))'  || exit 1
-$VALGRIND ldbsearch '(|(uid=uham)(uid=uham))'  || exit 1
-$VALGRIND ldbsearch '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))'  || exit 1
-$VALGRIND ldbsearch '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))'  || exit 1
-$VALGRIND ldbsearch '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \* \+ dn  || exit 1
-$VALGRIND ldbsearch '(&(uid=uham)(uid=uha*)(title=*))' uid || exit 1
+$VALGRIND ldbsearch$EXEEXT '(uid=uham)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1
+$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham))'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham))'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \* \+ dn  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uha*)(title=*))' uid || exit 1
 
 # note that the "((" is treated as an attribute not an expression
 # this matches the openldap ldapsearch behaviour of looking for a '='
 # to see if the first argument is an expression or not
-$VALGRIND ldbsearch '((' uid || exit 1
-$VALGRIND ldbsearch '(objectclass=)' uid || exit 1
-$VALGRIND ldbsearch -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1
+$VALGRIND ldbsearch$EXEEXT '((' uid || exit 1
+$VALGRIND ldbsearch$EXEEXT '(objectclass=)' uid || exit 1
+$VALGRIND ldbsearch$EXEEXT -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1
 
 echo "Test wildcard match"
-$VALGRIND ldbadd $LDBDIR/tests/test-wildcard.ldif  || exit 1
-$VALGRIND ldbsearch '(cn=test*multi)'  || exit 1
-$VALGRIND ldbsearch '(cn=*test*multi*)'  || exit 1
-$VALGRIND ldbsearch '(cn=*test_multi)'  || exit 1
-$VALGRIND ldbsearch '(cn=test_multi*)'  || exit 1
-$VALGRIND ldbsearch '(cn=test*multi*test*multi)'  || exit 1
-$VALGRIND ldbsearch '(cn=test*multi*test*multi*multi_*)' || exit 1
+$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wildcard.ldif  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=test*multi)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=*test*multi*)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=*test_multi)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=test_multi*)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi)'  || exit 1
+$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi*multi_*)' || exit 1
 
 echo "Starting ldbtest indexed"
-$VALGRIND ldbtest --num-records 100 --num-searches 500  || exit 1
+$VALGRIND ldbtest$EXEEXT --num-records 100 --num-searches 500  || exit 1
 
 echo "Testing one level search"
-count=`$VALGRIND ldbsearch -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch$EXEEXT -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep '^dn' | wc -l`
 if [ $count != 3 ]; then
     echo returned $count records - expected 3
     exit 1
@@ -83,8 +83,8 @@ fi
 echo "Testing binary file attribute value"
 mkdir -p tests/tmp
 cp $LDBDIR/tests/samba4.png tests/tmp/samba4.png
-$VALGRIND ldbmodify $LDBDIR/tests/photo.ldif || exit 1
-count=`$VALGRIND ldbsearch '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
+$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/photo.ldif || exit 1
+count=`$VALGRIND ldbsearch$EXEEXT '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
 if [ $count != 1 ]; then
     echo returned $count records - expected 1
     exit 1
@@ -94,13 +94,13 @@ rm -f tests/tmp/samba4.png
 echo "*TODO* Testing UTF8 upper lower case searches !!"
 
 echo "Testing compare"
-count=`$VALGRIND ldbsearch '(cn>=t)' cn | grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch$EXEEXT '(cn>=t)' cn | grep '^dn' | wc -l`
 if [ $count != 2 ]; then
     echo returned $count records - expected 2
     echo "this fails on openLdap ..."
 fi
 
-count=`$VALGRIND ldbsearch '(cn<=t)' cn | grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch$EXEEXT '(cn<=t)' cn | grep '^dn' | wc -l`
 if [ $count != 13 ]; then
     echo returned $count records - expected 13
     echo "this fails on openLdap ..."
@@ -111,7 +111,7 @@ checkcount() {
     scope=$2
     basedn=$3
     expression="$4"
-    n=`bin/ldbsearch -s "$scope" -b "$basedn" "$expression" | grep '^dn' | wc -l`
+    n=`$VALGRIND ldbsearch$EXEEXT -s "$scope" -b "$basedn" "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
 	echo "Got $n but expected $count for $expression"
 	bin/ldbsearch "$expression"
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
diff --git a/source4/lib/ldb/tests/test-tdb.sh b/source4/lib/ldb/tests/test-tdb.sh
index 7c4f5205b4..1c35451962 100755
--- a/source4/lib/ldb/tests/test-tdb.sh
+++ b/source4/lib/ldb/tests/test-tdb.sh
@@ -17,12 +17,12 @@ if [ -z "$LDBDIR" ]; then
     export LDBDIR
 fi
 
-cat <<EOF | $VALGRIND ldbadd || exit 1
+cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
 dn: @MODULES
 @LIST: rdn_name
 EOF
 
-$VALGRIND ldbadd $LDBDIR/tests/init.ldif || exit 1
+$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/init.ldif || exit 1
 
 . $LDBDIR/tests/test-generic.sh