From 977f4aab147e88dda8597fa025edae60e000c7c1 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 20 Mar 2024 12:54:44 -0500
Subject: [PATCH] h5diff compares attribute data like dataset data (#4191)

Updates tools docs to indicate that dataset and attribute data are compared in the same way
---
 tools/src/h5diff/h5diff_common.c          | 2 +-
 tools/test/h5diff/expected/h5diff_10.txt  | 2 +-
 tools/test/h5diff/expected/h5diff_600.txt | 2 +-
 tools/test/h5diff/expected/h5diff_603.txt | 2 +-
 tools/test/h5diff/expected/h5diff_606.txt | 2 +-
 tools/test/h5diff/expected/h5diff_612.txt | 2 +-
 tools/test/h5diff/expected/h5diff_615.txt | 2 +-
 tools/test/h5diff/expected/h5diff_621.txt | 2 +-
 tools/test/h5diff/expected/h5diff_622.txt | 2 +-
 tools/test/h5diff/expected/h5diff_623.txt | 2 +-
 tools/test/h5diff/expected/h5diff_624.txt | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index c66311fb1bb..77b83533409 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -813,7 +813,7 @@ usage(void)
                    "      specified group) and generates a report of objects that appear in only\n");
     PRINTVALSTREAM(rawoutstream,
                    "      one group or in both groups. Common objects are then compared recursively.\n");
-    PRINTVALSTREAM(rawoutstream, "  2) Datasets\n");
+    PRINTVALSTREAM(rawoutstream, "  2) Attributes and Datasets\n");
     PRINTVALSTREAM(rawoutstream,
                    "      Array rank and dimensions, datatypes, and data values are compared.\n");
     PRINTVALSTREAM(rawoutstream, "  3) Datatypes\n");
diff --git a/tools/test/h5diff/expected/h5diff_10.txt b/tools/test/h5diff/expected/h5diff_10.txt
index dbd5418e623..a30da23a8fe 100644
--- a/tools/test/h5diff/expected/h5diff_10.txt
+++ b/tools/test/h5diff/expected/h5diff_10.txt
@@ -150,7 +150,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_600.txt b/tools/test/h5diff/expected/h5diff_600.txt
index 46a1c45a109..bdb7788af7d 100644
--- a/tools/test/h5diff/expected/h5diff_600.txt
+++ b/tools/test/h5diff/expected/h5diff_600.txt
@@ -150,7 +150,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_603.txt b/tools/test/h5diff/expected/h5diff_603.txt
index e930dbe50b4..ce1577c5f82 100644
--- a/tools/test/h5diff/expected/h5diff_603.txt
+++ b/tools/test/h5diff/expected/h5diff_603.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_606.txt b/tools/test/h5diff/expected/h5diff_606.txt
index 02b80ebba54..9ee22448c5b 100644
--- a/tools/test/h5diff/expected/h5diff_606.txt
+++ b/tools/test/h5diff/expected/h5diff_606.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_612.txt b/tools/test/h5diff/expected/h5diff_612.txt
index 4cccecec36c..fee63aaed28 100644
--- a/tools/test/h5diff/expected/h5diff_612.txt
+++ b/tools/test/h5diff/expected/h5diff_612.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_615.txt b/tools/test/h5diff/expected/h5diff_615.txt
index 3641164ca39..562308aaa9a 100644
--- a/tools/test/h5diff/expected/h5diff_615.txt
+++ b/tools/test/h5diff/expected/h5diff_615.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_621.txt b/tools/test/h5diff/expected/h5diff_621.txt
index 05b952c875b..03b69bba232 100644
--- a/tools/test/h5diff/expected/h5diff_621.txt
+++ b/tools/test/h5diff/expected/h5diff_621.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_622.txt b/tools/test/h5diff/expected/h5diff_622.txt
index 4d3e9455011..05e6b94c502 100644
--- a/tools/test/h5diff/expected/h5diff_622.txt
+++ b/tools/test/h5diff/expected/h5diff_622.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_623.txt b/tools/test/h5diff/expected/h5diff_623.txt
index fd992ef71cb..d2e81fa8f47 100644
--- a/tools/test/h5diff/expected/h5diff_623.txt
+++ b/tools/test/h5diff/expected/h5diff_623.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.
diff --git a/tools/test/h5diff/expected/h5diff_624.txt b/tools/test/h5diff/expected/h5diff_624.txt
index cc9578f84dc..94e6b4ef8af 100644
--- a/tools/test/h5diff/expected/h5diff_624.txt
+++ b/tools/test/h5diff/expected/h5diff_624.txt
@@ -151,7 +151,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
+  2) Attributes and Datasets
       Array rank and dimensions, datatypes, and data values are compared.
   3) Datatypes
       The comparison is based on the return value of H5Tequal.