blackbox/*.sh: pass -u to 'diff'

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

diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index e36379621c4429e842e1fa779fc97e5babc28a41..67fd6a49b61dc53287e731e554224e2628de5080 100755 (executable)
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -146,7 +146,7 @@ check_expected_userparameters() {
     if [ x$RELEASE = x"release-4-1-0rc3" ]; then
        tmpldif=$PREFIX_ABS/$RELEASE/expected-userParameters-after-dbcheck.ldif.tmp
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb userParameters=* -s sub -b DC=release-4-1-0rc3,DC=samba,DC=corp userParameters --sorted | grep -v \# > $tmpldif
-       diff $tmpldif $release_dir/expected-userParameters-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-userParameters-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
@@ -173,7 +173,7 @@ check_expected_before_values() {
     if [ x$RELEASE = x"release-4-1-0rc3" ]; then
        tmpldif=$PREFIX_ABS/$RELEASE/expected-replpropertymetadata-before-dbcheck.ldif.tmp
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything -s one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary > $tmpldif
-       diff $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
@@ -183,20 +183,20 @@ check_expected_before_values() {
        # Here we remove originating_change_time and whenChanged as
        # these are time-dependent, caused by the ldbmodify above.
 
-       diff $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck2.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck2.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
 
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything3 -s one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary > $tmpldif
-       diff $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck3.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck3.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
     elif [ x$RELEASE = x"release-4-5-0-pre1" ]; then
         tmpldif=$PREFIX_ABS/$RELEASE/rootdse-version.initial.txt.tmp
         TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -s base -b '' | grep highestCommittedUSN > $tmpldif
-        diff $tmpldif $release_dir/rootdse-version.initial.txt
+        diff -u $tmpldif $release_dir/rootdse-version.initial.txt
         if [ "$?" != "0" ]; then
             return 1
         fi
@@ -222,30 +222,30 @@ check_expected_after_values() {
     if [ x$RELEASE = x"release-4-1-0rc3" ]; then
        tmpldif=$PREFIX_ABS/$RELEASE/expected-replpropertymetadata-after-dbcheck.ldif.tmp
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything -s one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary > $tmpldif
-       diff $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything2 -s one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary | grep -v originating_change_time| grep -v whenChanged > $tmpldif
-       diff $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck2.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck2.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything3 -s one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary > $tmpldif
-       diff $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck3.ldif
+       diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck3.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
        # Check DomainDNS partition for replica locations
        tmpldif=$PREFIX_ABS/$RELEASE/expected-replica-locations-after-dbcheck.ldif.tmp
        $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=49a69498-9a85-48af-9be4-aa0b3e0054f9 -s one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations > $tmpldif
-       diff $tmpldif $release_dir/expected-replica-locations-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-replica-locations-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
        # Check ForestDNS partition for replica locations
        $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=7d2a15af-c0d4-487c-847e-e036292bcc65 -s one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations > $tmpldif
-       diff $tmpldif $release_dir/expected-replica-locations-after-dbcheck2.ldif
+       diff -u $tmpldif $release_dir/expected-replica-locations-after-dbcheck2.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
@@ -253,7 +253,7 @@ check_expected_after_values() {
         echo  $RELEASE  checking after values
        tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-dbcheck.ldif.tmp
         $ldbsearch -H  tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --show-recycled --show-deleted  --show-deactivated-link --reveal member memberOf lastKnownParent objectCategory lastKnownParent wellKnownObjects legacyExchangeDN  sAMAccountType uSNChanged --sorted > $tmpldif
-       diff $tmpldif $release_dir/expected-links-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-links-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
@@ -262,7 +262,7 @@ check_expected_after_values() {
        # this test will fail and can be removed.
         tmpversion=$PREFIX_ABS/$RELEASE/rootdse-version.final.txt.tmp
         TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -s base -b '' | grep highestCommittedUSN > $tmpversion
-        diff $tmpversion $release_dir/rootdse-version.final.txt
+        diff -u $tmpversion $release_dir/rootdse-version.final.txt
         if [ "$?" != "0" ]; then
             return 1
         fi
@@ -295,7 +295,7 @@ 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 | grep -v \# | sort > $tmpldif
-       diff $tmpldif $release_dir/expected-otherphone-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-otherphone-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi
@@ -369,7 +369,7 @@ check_expected_after_deleted_objects() {
     if [ x$RELEASE = x"release-4-1-0rc3" ]; then
        tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted_objects-after-dbcheck.ldif.tmp
        TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=deleted\ objects -s base -b cn=deleted\ objects,DC=release-4-1-0rc3,DC=samba,DC=corp objectClass description isDeleted isCriticalSystemObject objectGUID showInAdvancedViewOnly systemFlags --sorted --show-binary --show-deleted | grep -v \# | sort > $tmpldif
-       diff $tmpldif $release_dir/expected-deleted_objects-after-dbcheck.ldif
+       diff -u $tmpldif $release_dir/expected-deleted_objects-after-dbcheck.ldif
        if [ "$?" != "0" ]; then
            return 1
        fi