Commit 570204c9 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

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

Add -n option to slapd
parent 47333bf7
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment