Use LDIFFILTER to avoid Windows EOL issues on $CMP

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 797d828802a91fc494f33ed1a9be4063fa0af1b6..b8c43401114bc6c08245d031ce4ff7364a5464e0 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -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"

diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn
index 6d1223bf610b7af62157f37abba6b96e64276afd..01417a0f96ece8888141dfa8fc5de973ae2b270d 100755 (executable)
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@@ -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"

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 9951fa848b03b590658c6ca5effcb65dd3610921..1553147e95edfacd26f4695845f1a6e09427152a 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -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"

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index 7728d676efd1d62b4d7290725e2b49e384f769ae..f7af23ca3e2240614a09cd026706c5b0a62313d4 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -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!"