From 570204c9e2f6afbed82e7088f9d2a1b8b349656c Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 27 May 2000 17:16:10 +0000
Subject: [PATCH] s/cmp/$CMP/  define CMP to cmp (to allow cmp replacements)
 Add -n option to slapd

---
 tests/scripts/defines.sh          | 2 ++
 tests/scripts/test001-slapadd     | 2 +-
 tests/scripts/test002-populate    | 2 +-
 tests/scripts/test003-search      | 2 +-
 tests/scripts/test004-modify      | 2 +-
 tests/scripts/test005-modrdn      | 2 +-
 tests/scripts/test006-acls        | 2 +-
 tests/scripts/test007-replication | 2 +-
 tests/scripts/test008-concurrency | 2 +-
 tests/scripts/test009-referral    | 6 +++---
 10 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index ec0c2d5d02..a1a28b23f4 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -32,6 +32,8 @@ CLIENTDIR=../clients/tools
 
 LDIF2LDBM="../servers/slapd/tools/slapadd $LDAP_VERBOSE"
 
+CMP=cmp
+#CMP=diff -i -q
 SLAPD=../servers/slapd/slapd
 SLURPD=../servers/slurpd/slurpd
 LDAPPASSWD="$CLIENTDIR/ldappasswd"
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index dc6d9fc2b0..9a2a283019 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -55,7 +55,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - database was not created correctly"
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 74f0579e23..1f59703832 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -58,7 +58,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - database was not created correctly"
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 0f662247f1..eb79e876d3 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -93,7 +93,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "Comparison failed"
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 9ee7964321..59db1498a6 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -135,7 +135,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - modify operations did not complete correctly"
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index f4dedf48fc..c648da3b4b 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -91,7 +91,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - modrdn operations did not complete correctly"
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 44952801e0..63557bd79b 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -131,7 +131,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - modify operations did not complete correctly"
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 32bcf1aed2..32114d8abb 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -174,7 +174,7 @@ echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 
 echo "Comparing retrieved entries from master and slave..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "test failed - master and slave databases differ"
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index e221bbed98..753bcc357a 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -72,7 +72,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "comparison failed - database was not created correctly"
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index ae0fb9b4af..5273b5f205 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -31,11 +31,11 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+$SLAPD -n master -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $REFSLAVECONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
+$SLAPD -n slave -f $REFSLAVECONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Testing for master slapd..."
@@ -113,7 +113,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
 	echo "Comparison failed"