ignore blanks in subtree diff

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 645024ba42e2136611c47dd03bb0518abc8bbaf3..f514d3c6f1b75a844475e9659dac0248684856ca 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -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

diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index ed1a9c10a4669a67335964914fb4ef296be3f07c..9b7f7a2910aa69e8484b695eedab945be693b120 100755 (executable)
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@@ -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"