From: Patrick Donnelly <pdonnell@ibm.com>
Date: Tue, 2 Dec 2025 02:08:22 +0000 (-0500)
Subject: test/encoding: print context on diff failure
X-Git-Tag: v20.2.1~8^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f0b679b0fc4edef1578a620e36464e20e08d274;p=ceph.git

test/encoding: print context on diff failure

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 7fdf680c13777ab84b9b0c44a0641aa2eb4bef04)
---

diff --git a/src/test/encoding/check-generated.sh b/src/test/encoding/check-generated.sh
index aae5bd48f759..c297d415273a 100755
--- a/src/test/encoding/check-generated.sh
+++ b/src/test/encoding/check-generated.sh
@@ -53,7 +53,7 @@ test_selected_type() {
             echo "**** $type test $n dump_json check failed ****"
             echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
             echo "   ceph-dencoder type $type select_test $n encode decode dump_json > $tmp2"
-            diff $tmp1 $tmp2
+            diff -au $tmp1 $tmp2
             failed=$(($failed + 1))
         fi
 
@@ -61,7 +61,7 @@ test_selected_type() {
             echo "**** $type test $n copy dump_json check failed ****"
             echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
             echo "   ceph-dencoder type $type select_test $n copy dump_json > $tmp2"
-            diff $tmp1 $tmp2
+            diff -au $tmp1 $tmp2
             failed=$(($failed + 1))
         fi
 
@@ -69,7 +69,7 @@ test_selected_type() {
             echo "**** $type test $n copy_ctor dump_json check failed ****"
             echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
             echo "   ceph-dencoder type $type select_test $n copy_ctor dump_json > $tmp2"
-            diff $tmp1 $tmp2
+            diff -au $tmp1 $tmp2
             failed=$(($failed + 1))
         fi
 
@@ -82,7 +82,7 @@ test_selected_type() {
                 echo "**** $type test $n binary reencode check failed ****"
                 echo "   ceph-dencoder type $type select_test $n encode export $tmp1"
                 echo "   ceph-dencoder type $type select_test $n encode decode encode export $tmp2"
-                diff <(hexdump -C $tmp1) <(hexdump -C $tmp2)
+                diff -au <(hexdump -C $tmp1) <(hexdump -C $tmp2)
                 failed=$(($failed + 1))
             fi
         fi