Replace diff -q with diff >/dev/null for portability reasons

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index b772af34b19349636a77b71bac0b0c8674bb4db5..cc56ee7e75b4f96b67ac620abc307a6325b6df66 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -31,8 +31,8 @@ CLIENTDIR=../clients/tools
 
 LDIF2LDBM="../servers/slapd/tools/slapadd $LDAP_VERBOSE"
 
-#CMP=cmp
-CMP="diff -i -q"
+CMP="diff -i"
+CMPOUT=/dev/null
 SLAPD=../servers/slapd/slapd
 SLURPD=../servers/slurpd/slurpd
 LDAPPASSWD="$CLIENTDIR/ldappasswd $TOOLARGS"

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 052624be7cdf1bffc4ddf10c1a15b6fe2016dd7f..628a7f7c3463d4eaed8fd1603eba8c8d753fb0dd 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -54,7 +54,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index fdf62cb97d4267c3e0c889207f34d92e0e43d33c..8846768828ae443735ce84249a84eca56bacc214 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -58,7 +58,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index bced8e1fbb5b7ed2204d4ca8a2c05a58a7cc458a..8d536378cbe8fd51bd6738efdbc18afa44487149 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -93,7 +93,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed"

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index f485007de75ed098c3081187c3ed79466268343a..73fb373f5f3847d17489d6bca24e3adcd056bde9 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -135,7 +135,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modify operations did not complete correctly"

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index f72ccfdf6adec3ce34da6f0c62eba7f07d3df9ac..00c0705188cbad498a716055705ad487148ce08c 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -91,7 +91,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -118,7 +118,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -138,7 +138,7 @@ if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        exit $RC
 fi
-$CMP $SEARCHOUT /dev/null
+$CMP $SEARCHOUT /dev/null > $CMPOUT
 if test $? != 0 ; then
        echo "failure: ldapsearch found attribute that was to be removed!"
        kill -HUP $PID
@@ -162,7 +162,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -203,7 +203,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 kill -HUP $PID
 if test $? != 0 ; then

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index a9defa4414a573f149aa24fa47954abb78bcd5f1..ea756a2cdf00a469e5a1c2778a88c52f6c89686b 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -131,7 +131,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modify operations did not complete correctly"

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index f71a002120478966c48aaad01df0bd37a4a48fed..870e68398531b9e7a69d7b00638a7bda658123f3 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -174,7 +174,7 @@ echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 
 echo "Comparing retrieved entries from master and slave..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "test failed - master and slave databases differ"

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index 8110d37e6182aca0bb04d37da531f4e1b18c2e36..bfaacb9e77e6411ca859a8338622c998f711ceda 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -72,7 +72,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 745c9cff996a20757ea6dc37f88fb1e900775496..b2cb1782885f1304c70432caec1b62ff0037b073 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -113,7 +113,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed"