selftest: Avoid sorting issues on Ubuntu 10.04 vs 14.04

[sfrench/samba-autobuild/.git] / testprogs / blackbox / dbcheck-oldrelease.sh

diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index 18c5c6e2ff4064a335c3523c80f20ae90485acb5..89c0c0fdb5f69119305ccebfb0130d97950cb80d 100755 (executable)
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -231,7 +231,7 @@ dbcheck_after_dup() {
 check_expected_after_dup_values() {
     if [ x$RELEASE = x"release-4-1-0rc3" ]; then
        tmpldif=$PREFIX_ABS/$RELEASE/expected-otherphone-after-dbcheck.ldif.tmp
-       TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator -s base -b cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp otherHomePhone --sorted --show-binary | sort > $tmpldif
+       TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator -s base -b cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp otherHomePhone --sorted --show-binary | grep -v \# | sort > $tmpldif
        diff $tmpldif $release_dir/expected-otherphone-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1