[svn-r7792] Purpose:

h5diff new features
bug fix

Description:
implemented the diff for STRING and ARRAY types
fixed a bug. when the datasets are empty, do not try to compare them .
the check empty is made with H5Dgetstorage_size

Solution:

Platforms tested:
linux
solaris 5.7
IRIX

Misc. update:

12 files changed, 0 insertions, 88 deletions

diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt
index e7b30f1..d0a072e 100644
--- a/tools/testfiles/h5diff_30.txt
+++ b/tools/testfiles/h5diff_30.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt
index 1244794..18b51fc 100644
--- a/tools/testfiles/h5diff_31.txt
+++ b/tools/testfiles/h5diff_31.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt
index c401cf7..904bd5b 100644
--- a/tools/testfiles/h5diff_32.txt
+++ b/tools/testfiles/h5diff_32.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt
index 1422402..3829c25 100644
--- a/tools/testfiles/h5diff_33.txt
+++ b/tools/testfiles/h5diff_33.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt
index 6aca9b0..9261800 100644
--- a/tools/testfiles/h5diff_34.txt
+++ b/tools/testfiles/h5diff_34.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_35.txt b/tools/testfiles/h5diff_35.txt
index 5f4e6ad..5b18d3f 100644
--- a/tools/testfiles/h5diff_35.txt
+++ b/tools/testfiles/h5diff_35.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_36.txt b/tools/testfiles/h5diff_36.txt
index bc845b6..01f6c07 100644
--- a/tools/testfiles/h5diff_36.txt
+++ b/tools/testfiles/h5diff_36.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_37.txt b/tools/testfiles/h5diff_37.txt
index 65bcf11..ce746a8 100644
--- a/tools/testfiles/h5diff_37.txt
+++ b/tools/testfiles/h5diff_37.txt
@@ -16,23 +16,15 @@ file1     file2
     x      x    /string        
     x      x    /vlen          
 
-Comparison not supported
-</array> is of class H5T_ARRAY and </array> is of class H5T_ARRAY
 
 Comparison not supported
 </bitfield> is of class H5T_BITFIELD and </bitfield> is of class H5T_BITFIELD
 
-Comparing </compound> with </compound>
-0 differences found
 
 Comparison not supported
 </enum> is of class H5T_ENUM and </enum> is of class H5T_ENUM
 
-Comparing </float> with </float>
-0 differences found
 
-Comparing </integer> with </integer>
-0 differences found
 
 Comparison not supported
 </opaque> is of class H5T_OPAQUE and </opaque> is of class H5T_OPAQUE
@@ -40,8 +32,6 @@ Comparison not supported
 Comparison not supported
 </ref> is of class H5T_REFERENCE and </ref> is of class H5T_REFERENCE
 
-Comparison not supported
-</string> is of class H5T_STRING and </string> is of class H5T_STRING
 
 Comparison not supported
 </vlen> is of class H5T_VLEN and </vlen> is of class H5T_VLEN
diff --git a/tools/testfiles/h5diff_38.txt b/tools/testfiles/h5diff_38.txt
index 206f050..82472e3 100644
--- a/tools/testfiles/h5diff_38.txt
+++ b/tools/testfiles/h5diff_38.txt
@@ -2,7 +2,5 @@
 Expected output for 'h5diff file4.h5 file4.h5 -v integer float'
 #############################
 $h5diff file4.h5 file4.h5 -v integer float
-Comparing </float> with </float>
-0 differences found
 
 
diff --git a/tools/testfiles/h5diff_40.txt b/tools/testfiles/h5diff_40.txt
index 1ee7449..72d2e7d 100644
--- a/tools/testfiles/h5diff_40.txt
+++ b/tools/testfiles/h5diff_40.txt
@@ -2,7 +2,5 @@
 Expected output for 'h5diff file5.h5 file5.h5 -v dset1 dset2'
 #############################
 $h5diff file5.h5 file5.h5 -v dset1 dset2
-Comparing </dset2> with </dset2>
-0 differences found
 
 
diff --git a/tools/testfiles/h5diff_41.txt b/tools/testfiles/h5diff_41.txt
index e1112cb..f2dbd25 100644
--- a/tools/testfiles/h5diff_41.txt
+++ b/tools/testfiles/h5diff_41.txt
@@ -2,7 +2,5 @@
 Expected output for 'h5diff file5.h5 file5.h5 -v dset3 dset4'
 #############################
 $h5diff file5.h5 file5.h5 -v dset3 dset4
-Comparing </dset4> with </dset4>
-0 differences found
 
 
diff --git a/tools/testfiles/h5diff_42.txt b/tools/testfiles/h5diff_42.txt
index 7f48b42..b71acd0 100644
--- a/tools/testfiles/h5diff_42.txt
+++ b/tools/testfiles/h5diff_42.txt
@@ -2,7 +2,5 @@
 Expected output for 'h5diff file5.h5 file5.h5 -v dset5 dset6'
 #############################
 $h5diff file5.h5 file5.h5 -v dset5 dset6
-Comparing </dset6> with </dset6>
-0 differences found