s/cmp/$CMP/ define CMP to cmp (to allow cmp replacements)

Add -n option to slapd

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index ec0c2d5d029a1a797ffe0eeb1cfe8f491a715a01..a1a28b23f441c4ea70ee10d907d10402e95d0297 100755 (executable)
--- 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 dc6d9fc2b0e4bb6452b91f9a84f625a747a42258..9a2a28301927009882ef9dd0d6b61543a80c20c4 100755 (executable)
--- 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 74f0579e2372295955354b615f85af19db4e2b75..1f59703832b1efc995080c8483e61308fc062f7b 100755 (executable)
--- 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 0f662247f16069cc9aa667dc6976a9adf588143f..eb79e876d36c206bc67175a14257815e2d68ceeb 100755 (executable)
--- 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 9ee7964321564191e10f2650fc494d01c10fe47a..59db1498a6e8bde07fc419b8d04e93ce57de8bb4 100755 (executable)
--- 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 f4dedf48fcd938ded0d7ddba2b05868b0c10a131..c648da3b4b672a1aa5e72f697fcd176be433ba7a 100755 (executable)
--- 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 44952801e01f6e800c8531d6f24883e5d1540032..63557bd79ba918acd0515baf96b5c3404d4619b9 100755 (executable)
--- 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 32bcf1aed2f851904ab8682feebe4bbe4905d37f..32114d8abbc236c408576fe109878a2a71d2cf95 100755 (executable)
--- 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 e221bbed989862bad34caadfd326375981f2a5c4..753bcc357a9fa03e0dcd3bd9cdb2a70f638e5d5e 100755 (executable)
--- 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 ae0fb9b4afc0054b8fdc68b3a06541d783bcfe56..5273b5f2057571283493e33c463d1cc61ac64f14 100755 (executable)
--- 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"