ignore blanks in subtree diff

This commit is contained in:
Pierangelo Masarati 2003-02-05 21:20:04 +00:00
parent 1aae1854ac
commit 045fa7dc31
2 changed files with 3 additions and 2 deletions

View File

@ -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

View File

@ -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"