git.samba.org / garming / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3075b85)
blackbox/*.sh: pass -u to 'diff'
authorStefan Metzmacher <metze@samba.org>
Tue, 12 Mar 2019 09:36:49 +0000 (10:36 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 14 Mar 2019 02:12:19 +0000 (02:12 +0000)
This is what we work with every day...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13816

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
testprogs/blackbox/dbcheck-links.sh patch | blob | history
testprogs/blackbox/dbcheck-oldrelease.sh patch | blob | history
testprogs/blackbox/tombstones-expunge.sh patch | blob | history

diff --git a/testprogs/blackbox/dbcheck-links.sh b/testprogs/blackbox/dbcheck-links.sh
index 9798813004c5c11d31c16961546534908e38ea67..7b18e11feb3dbe2f2953c413f6c8989cdb7a9854 100755 (executable)
--- a/testprogs/blackbox/dbcheck-links.sh
+++ b/testprogs/blackbox/dbcheck-links.sh
@@ -63,7 +63,7 @@ dbcheck_clean() {
     tmpldif2=$PREFIX_ABS/$RELEASE/expected-dbcheck-output2.txt.tmp2
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -s base -b '' | grep highestCommittedUSN > $tmpldif2
 
-    diff $tmpldif1 $tmpldif2
+    diff -u $tmpldif1 $tmpldif2
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -72,7 +72,7 @@ dbcheck_clean() {
 check_expected_after_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-link-dbcheck.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member > $tmpldif
-    diff $tmpldif $release_dir/expected-links-after-link-dbcheck.ldif
+    diff -u $tmpldif $release_dir/expected-links-after-link-dbcheck.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -81,7 +81,7 @@ check_expected_after_links() {
 check_expected_after_deleted_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted-links-after-link-dbcheck.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member > $tmpldif
-    diff $tmpldif $release_dir/expected-deleted-links-after-link-dbcheck.ldif
+    diff -u $tmpldif $release_dir/expected-deleted-links-after-link-dbcheck.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -90,7 +90,7 @@ check_expected_after_deleted_links() {
 check_expected_after_objects() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-objects-after-link-dbcheck.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user1x)(samaccountname=user2))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName > $tmpldif
-    diff $tmpldif $release_dir/expected-objects-after-link-dbcheck.ldif
+    diff -u $tmpldif $release_dir/expected-objects-after-link-dbcheck.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -125,7 +125,7 @@ dbcheck_duplicate_member() {
 check_expected_after_duplicate_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-duplicates-after-link-dbcheck.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=administrator)(cn=enterprise admins))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member > $tmpldif
-    diff $tmpldif $release_dir/expected-duplicates-after-link-dbcheck.ldif
+    diff -u $tmpldif $release_dir/expected-duplicates-after-link-dbcheck.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -306,7 +306,7 @@ dbcheck_forward_link_corruption() {
 check_expected_after_dbcheck_forward_link_corruption() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-after-dbcheck-forward-link-corruption.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=dangling)(cn=enterprise admins))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member > $tmpldif
-    diff $tmpldif $release_dir/expected-after-dbcheck-forward-link-corruption.ldif
+    diff -u $tmpldif $release_dir/expected-after-dbcheck-forward-link-corruption.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -367,7 +367,7 @@ dbcheck_oneway_link_corruption() {
 check_expected_after_dbcheck_oneway_link_corruption() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-after-dbcheck-oneway-link-corruption.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(ou=dangling-ou)(ou=dangling-ou2)(ou=dangling-from))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted seeAlso > $tmpldif
-    diff $tmpldif $release_dir/expected-after-dbcheck-oneway-link-corruption.ldif
+    diff -u $tmpldif $release_dir/expected-after-dbcheck-oneway-link-corruption.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
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
diff --git a/testprogs/blackbox/tombstones-expunge.sh b/testprogs/blackbox/tombstones-expunge.sh
index d03547f85cd7f37704b37499f065d11fee569560..aa37cfe278faafe32dea7a404937de0e618918ef 100755 (executable)
--- a/testprogs/blackbox/tombstones-expunge.sh
+++ b/testprogs/blackbox/tombstones-expunge.sh
@@ -54,7 +54,7 @@ tombstones_expunge() {
     if [ "$?" != "0" ]; then
        return 1
     fi
-    diff $tmpfile $release_dir/expected-expunge-output.txt
+    diff -u $tmpfile $release_dir/expected-expunge-output.txt
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -62,7 +62,7 @@ tombstones_expunge() {
     tmpldif2=$PREFIX_ABS/$RELEASE/expected-expunge-output2.txt.tmp2
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -s base -b '' | grep highestCommittedUSN > $tmpldif2
 
-    diff $tmpldif1 $tmpldif2
+    diff -u $tmpldif1 $tmpldif2
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -124,7 +124,7 @@ remove_one_user() {
 check_match_rule_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-match-rule-links.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted no_attrs > $tmpldif
-    diff $tmpldif $release_dir/expected-match-rule-links.ldif
+    diff -u $tmpldif $release_dir/expected-match-rule-links.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -165,7 +165,7 @@ check_match_rule_links_notlink() {
 check_expected_after_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-expunge.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member > $tmpldif
-    diff $tmpldif $release_dir/expected-links-after-expunge.ldif
+    diff -u $tmpldif $release_dir/expected-links-after-expunge.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -174,7 +174,7 @@ check_expected_after_links() {
 check_expected_after_deleted_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted-links-after-expunge.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member > $tmpldif
-    diff $tmpldif $release_dir/expected-deleted-links-after-expunge.ldif
+    diff -u $tmpldif $release_dir/expected-deleted-links-after-expunge.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -183,7 +183,7 @@ check_expected_after_deleted_links() {
 check_expected_after_objects() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-objects-after-expunge.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user2))' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName > $tmpldif
-    diff $tmpldif $release_dir/expected-objects-after-expunge.ldif
+    diff -u $tmpldif $release_dir/expected-objects-after-expunge.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
@@ -192,7 +192,7 @@ check_expected_after_objects() {
 check_expected_unsorted_links() {
     tmpldif=$PREFIX_ABS/$RELEASE/expected-unsorted-links-after-expunge.ldif.tmp
     TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(name=unsorted-g)' -s sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member > $tmpldif
-    diff $tmpldif $release_dir/expected-unsorted-links-after-expunge.ldif
+    diff -u $tmpldif $release_dir/expected-unsorted-links-after-expunge.ldif
     if [ "$?" != "0" ]; then
        return 1
     fi
Unnamed repository; edit this file 'description' to name the repository.