upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 20:49:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use LDIFFILTER to avoid Windows EOL issues on $CMP

Browse source
This commit is contained in:
Howard Chu 2005-08-28 03:59:21 +00:00
parent 975de9aa5b
commit 11cb50bd95
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/scripts/test020-proxycache
View file

@ -273,8 +273,10 @@ else
exit 1
fi
echo "Comparing cache output..."
$CMP $SLAVEOUT $PROXYCACHEOUT > $CMPOUT
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SLAVEOUT > $SEARCHFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $PROXYCACHEOUT > $CMPOUT
if test $? != 0 ; then
echo "Comparison failed"

4
tests/scripts/test026-dn
View file

@ -118,8 +118,10 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
LDIFOUT=$DNOUT
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Comparing ldapsearch results against original..."
$CMP $SEARCHOUT $LDIFOUT > $CMPOUT
$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
if test $? != 0 ; then
echo "comparison failed - DN write operations did not complete correctly"

8
tests/scripts/test027-emptydn
View file

@ -78,8 +78,10 @@ wait
LDIFOUT=$EMPTYDNOUT1
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Comparing ldapsearch results against original..."
$CMP $SEARCHOUT $LDIFOUT > $CMPOUT
$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
if test $? != 0 ; then
echo "comparison failed - empty DN write operations did not complete correctly"
@ -150,8 +152,10 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
LDIFOUT=$EMPTYDNOUT2
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Comparing ldapsearch results against original..."
$CMP $SEARCHOUT $LDIFOUT > $CMPOUT
$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
if test $? != 0 ; then
echo "comparison failed - empty DN write operations did not complete correctly"

3
tests/scripts/test034-translucent
View file

@ -256,7 +256,8 @@ if test $RC != 0 ; then
exit $RC
fi
$CMP $SEARCHOUT $LDIFTRANSLUCENTMERGED > $CMPOUT
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
$CMP $SEARCHFLT $LDIFTRANSLUCENTMERGED > $CMPOUT
if test $? != 0 ; then
echo "Comparison failed -- local data failed to merge with remote!"