diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2016-03-09 14:08:41 +1300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-03-15 23:46:31 +0100 |
| commit | 40fb6fd9d0d726fc28a6c6327968a5f8253186ef (patch) | |
| tree | c580c2a7b5c9b315f944e8a155a1f3eba325d6d2 | |
| parent | 518401551d5ee4222cab977a6b94c919ce989be0 (diff) | |
| download | samba-40fb6fd9d0d726fc28a6c6327968a5f8253186ef.tar.gz | |
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
Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Tue Mar 15 23:46:31 CET 2016 on sn-devel-144
| -rw-r--r-- | source4/selftest/provisions/release-4-1-0rc3/expected-otherphone-after-dbcheck.ldif | 4 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck-oldrelease.sh | 2 |
2 files changed, 1 insertions, 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 b26e116d7c9..900c6fa3121 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 18c5c6e2ff4..89c0c0fdb5f 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 |