selftest: Avoid sorting issues on Ubuntu 10.04 vs 14.04

The unimportant lines starting with # sorted differently between these
two platforms.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit ca9bbc8cc5bdf83de532d7afe094e35cdeee788c)

The last 42 patches address

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11789
Required changes for talloc-2.1.6

diff --git a/source4/selftest/provisions/release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif b/source4/selftest/provisions/release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif
index b26e116d7c9a426530b5d66c16f37f4b03b658f2..900c6fa31213351ae0ab33800eeb864b483481bf 100644 (file)
--- a/source4/selftest/provisions/release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif
+++ b/source4/selftest/provisions/release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif
@@ -1,9 +1,5 @@
 
-# 0 referrals
-# 1 entries
 dn: CN=Administrator,CN=Users,DC=release-4-1-0rc3,DC=samba,DC=corp
 otherHomePhone: 1
 otherHomePhone: 2
 otherHomePhone: 3
-# record 1
-# returned 1 records

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