[svn-r7813] Purpose:

h5diff new feature


Description:

added compare for attributes
a new options flag (-a) was added to the options structure. it is 0 by default (no compare )
the output of the compare is the same that for datasets, and all the other flags also apply for attributes
(the memory compare is done in the same function diff_array)
all the other requirements for compare of datasets (type, space) are identical too




Platforms tested:
linux
solaris 2.7
IRIX


Misc. update:

26 files changed, 26 insertions, 16 deletions

diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt
index b813fdf..4e6a015 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/testfiles/h5diff_10.txt
@@ -15,6 +15,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt
index ba70578..cc2498e 100644
--- a/tools/testfiles/h5diff_30.txt
+++ b/tools/testfiles/h5diff_30.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt
index 93cac4e..c7ea23a 100644
--- a/tools/testfiles/h5diff_31.txt
+++ b/tools/testfiles/h5diff_31.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt
index e9e14d8..4872654 100644
--- a/tools/testfiles/h5diff_32.txt
+++ b/tools/testfiles/h5diff_32.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt
index 549db5e..54350cb 100644
--- a/tools/testfiles/h5diff_33.txt
+++ b/tools/testfiles/h5diff_33.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt
index 7c4b9c4..20e5dc7 100644
--- a/tools/testfiles/h5diff_34.txt
+++ b/tools/testfiles/h5diff_34.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_35.txt b/tools/testfiles/h5diff_35.txt
index a111a2f..ba08719 100644
--- a/tools/testfiles/h5diff_35.txt
+++ b/tools/testfiles/h5diff_35.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_36.txt b/tools/testfiles/h5diff_36.txt
index da9257b..a818cfd 100644
--- a/tools/testfiles/h5diff_36.txt
+++ b/tools/testfiles/h5diff_36.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_37.txt b/tools/testfiles/h5diff_37.txt
index 08e2309..d6f4a01 100644
--- a/tools/testfiles/h5diff_37.txt
+++ b/tools/testfiles/h5diff_37.txt
@@ -23,8 +23,7 @@ file1     file2
 </float> and </float> are empty datasets
 </integer> and </integer> are empty datasets
 </opaque> and </opaque> are empty datasets
-Comparison not supported
-</ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
+</ref> and </ref> are empty datasets
 </string> and </string> are empty datasets
 </vlen> and </vlen> are empty datasets
 
diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt
index 5a1cd10..9b69c4d 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/testfiles/h5diff_600.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_601.txt b/tools/testfiles/h5diff_601.txt
index 85e018f..589240b 100644
--- a/tools/testfiles/h5diff_601.txt
+++ b/tools/testfiles/h5diff_601.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt
index 46f6307..2441ab1 100644
--- a/tools/testfiles/h5diff_602.txt
+++ b/tools/testfiles/h5diff_602.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt
index 551dbb3..d1a39d1 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/testfiles/h5diff_603.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt
index 1910666..2b158a8 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/testfiles/h5diff_604.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt
index e1bfa68..299a5e6 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/testfiles/h5diff_605.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt
index 7879a90..6bdb8a5 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/testfiles/h5diff_606.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt
index 9358186..a384386 100644
--- a/tools/testfiles/h5diff_611.txt
+++ b/tools/testfiles/h5diff_611.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt
index 090da81..a327942 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/testfiles/h5diff_612.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt
index 5a6f087..27ab9f7 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/testfiles/h5diff_613.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt
index 1939dbd..e7cf2d6 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/testfiles/h5diff_614.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt
index 6bdd490..dce86dc 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/testfiles/h5diff_615.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt
index e731904..fd1b155 100644
--- a/tools/testfiles/h5diff_620.txt
+++ b/tools/testfiles/h5diff_620.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt
index 5374e88..40f9d02 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/testfiles/h5diff_621.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt
index b2b9249..98f1008 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/testfiles/h5diff_622.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt
index 31fc9b6..cfb2e01 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/testfiles/h5diff_623.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)
diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt
index e4c74ab..a547aa5 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/testfiles/h5diff_624.txt
@@ -16,6 +16,7 @@ file2             File name of the second HDF5 file
 [-n count]        Print difference up to count number
 [-d delta]        Print difference when it is greater than limit delta
 [-p relative]     Print difference when it is greater than a relative limit
+[-a]              Compare attributes
 
 Items in [] are optional
 [obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)