mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pass expected output through ldiffilter before comparing with actual output

Browse Source
This commit is contained in:
Hallvard Furuseth 2009-11-29 17:54:04 +00:00
parent c066dd12dc
commit dcc36ef23b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/scripts/test027-emptydn
View File

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

3
tests/scripts/test034-translucent
View File

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

8
tests/scripts/test042-valsort
View File

@ -79,8 +79,10 @@ fi
echo "Filtering ldapsearch results..." echo "Filtering ldapsearch results..."
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering expected ldif..."
$LDIFFILTER < $VALSORTOUT1 > $LDIFFLT
echo "Comparing filter output..." echo "Comparing filter output..."
$CMP $SEARCHFLT $VALSORTOUT1 > $CMPOUT $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
if test $? != 0 ; then if test $? != 0 ; then
echo "Comparison failed" echo "Comparison failed"
@ -125,8 +127,10 @@ fi
echo "Filtering ldapsearch results..." echo "Filtering ldapsearch results..."
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering expected ldif..."
$LDIFFILTER < $VALSORTOUT2 > $LDIFFLT
echo "Comparing filter output..." echo "Comparing filter output..."
$CMP $SEARCHFLT $VALSORTOUT2 > $CMPOUT $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
if test $? != 0 ; then if test $? != 0 ; then
echo "Comparison failed" echo "Comparison failed"