Pass expected output through ldiffilter before comparing with actual output

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index bc3d02b86f6133981d54f0caeba8b483ed2e1f8c..3a2727ba8ee3bf5d0dacf75b6e855e85e6f9f422 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -78,12 +78,12 @@ fi
 kill -HUP $KILLPIDS
 wait
 
-LDIFOUT=$EMPTYDNOUT1
-
 echo "Filtering ldapsearch results..."
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+echo "Filtering expected results..."
+$LDIFFILTER < $EMPTYDNOUT1 > $LDIFFLT
 echo "Comparing ldapsearch results against original..."
-$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - empty DN write operations did not complete correctly"
@@ -154,12 +154,12 @@ fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
-LDIFOUT=$EMPTYDNOUT2
-
 echo "Filtering ldapsearch results..."
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+echo "Filtering expected results..."
+$LDIFFILTER < $EMPTYDNOUT2 > $LDIFFLT
 echo "Comparing ldapsearch results against original..."
-$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - empty DN write operations did not complete correctly"

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index 2f6653858bb0c97e9caf3f9ebcba233a505133ec..2c302e768f4b2181ac287632348eed4312638fae 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -245,7 +245,8 @@ if test $RC != 0 ; then
 fi
 
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
-$CMP $SEARCHFLT $LDIFTRANSLUCENTMERGED > $CMPOUT
+$LDIFFILTER < $LDIFTRANSLUCENTMERGED > $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed -- local data failed to merge with remote!"

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 640e7e04f323ba7942f9cf80d5d31657645b0846..dfac4cb75e8d7ab110b1d670d88ba03df7f6e034 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -79,8 +79,10 @@ fi
 
 echo "Filtering ldapsearch results..."
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+echo "Filtering expected ldif..."
+$LDIFFILTER < $VALSORTOUT1 > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $VALSORTOUT1 > $CMPOUT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed"
@@ -125,8 +127,10 @@ fi
 
 echo "Filtering ldapsearch results..."
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+echo "Filtering expected ldif..."
+$LDIFFILTER < $VALSORTOUT2 > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $VALSORTOUT2 > $CMPOUT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed"