From 11cb50bd95358f7a81d50edb5063560caddaf5d9 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sun, 28 Aug 2005 03:59:21 +0000
Subject: [PATCH] Use LDIFFILTER to avoid Windows EOL issues on $CMP

---
 tests/scripts/test020-proxycache  | 6 ++++--
 tests/scripts/test026-dn          | 4 +++-
 tests/scripts/test027-emptydn     | 8 ++++++--
 tests/scripts/test034-translucent | 3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 797d828802..b8c4340111 100755
--- 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 6d1223bf61..01417a0f96 100755
--- 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 9951fa848b..1553147e95 100755
--- 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 7728d676ef..f7af23ca3e 100755
--- 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!"
-- 
2.39.5