From 0d8839ec1415167ad74284b1820555283e61f5b5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 9 Mar 2016 14:08:41 +1300 Subject: [PATCH] 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 Reviewed-by: Garming Sam (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 --- .../release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif | 4 ---- testprogs/blackbox/dbcheck-oldrelease.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) 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 b26e116d7c9a..900c6fa31213 100644 --- 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 18c5c6e2ff40..89c0c0fdb5f6 100755 --- 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 -- 2.34.1