mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
Replace diff -q with diff >/dev/null for portability reasons
This commit is contained in:
parent
a8521d3034
commit
d76bbdab91
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user