mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-07 14:18:15 +08:00
ignore blanks in subtree diff
This commit is contained in:
parent
1aae1854ac
commit
045fa7dc31
@ -44,6 +44,7 @@ SLAPINDEX="../servers/slapd/tools/slapindex $LDAP_VERBOSE"
|
||||
unset DIFF_OPTIONS
|
||||
DIFF="diff -iu"
|
||||
CMP="diff -i"
|
||||
BCMP="diff -iB"
|
||||
CMPOUT=/dev/null
|
||||
SLAPD="../servers/slapd/slapd -s0"
|
||||
SLURPD=../servers/slurpd/slurpd
|
||||
|
@ -43,7 +43,7 @@ fi
|
||||
|
||||
# quick hack to check for awk
|
||||
echo "looking for a POSIX compliant awk"
|
||||
awk -W version >/dev/null 2>&1
|
||||
awk -W version >$CMPOUT 2>&1
|
||||
if test $? != 0 ; then
|
||||
echo "This test requires awk"
|
||||
exit 0
|
||||
@ -261,7 +261,7 @@ echo "Stripping subtree entries from master output..."
|
||||
| $STRIPATTR "description" > $SUBFLT2
|
||||
|
||||
echo "Comparing master minus subtree and master minus slave..."
|
||||
$CMP $SUBFLT $SUBFLT2 > $CMPOUT
|
||||
$BCMP $SUBFLT $SUBFLT2 > $CMPOUT
|
||||
|
||||
if test $? != 0 ; then
|
||||
echo "test failed - master and slave databases differ"
|
||||
|
Loading…
Reference in New Issue
Block a user