From a2f9ebb3ab3228563835681a19cdd88fc095b2ff Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Mon, 20 Mar 2006 14:39:46 -0500
Subject: [PATCH] [svn-r12124] Purpose: bug fix

Description:
1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done
2) some duplicate warnings were being made

Solution:
eliminate the duplicate warnings, put the if compare flag on the correct place

Platforms tested:
linux 32, 64
solaris

Misc. update:
---
 tools/h5diff/testh5diff_basic.c |   4 +-
 tools/lib/h5diff_dset.c         |  63 ++++++++++++--------------------
 tools/testfiles/file1.h5        | Bin 2192 -> 2192 bytes
 tools/testfiles/file2.h5        | Bin 2192 -> 2192 bytes
 tools/testfiles/file3.h5        | Bin 1408 -> 1408 bytes
 tools/testfiles/file4.h5        | Bin 11040 -> 11040 bytes
 tools/testfiles/file5.h5        | Bin 18008 -> 17624 bytes
 tools/testfiles/file6.h5        | Bin 18008 -> 17624 bytes
 tools/testfiles/file7.h5        | Bin 18616 -> 18616 bytes
 tools/testfiles/file8.h5        | Bin 18616 -> 18616 bytes
 tools/testfiles/h5diff_11.txt   |   4 --
 tools/testfiles/h5diff_13.txt   |   4 --
 tools/testfiles/h5diff_17.txt   |  23 ++----------
 tools/testfiles/h5diff_50.txt   |   3 --
 tools/testfiles/h5diff_53.txt   |   6 ---
 tools/testfiles/h5diff_57.txt   |  12 ++++--
 16 files changed, 38 insertions(+), 81 deletions(-)

diff --git a/tools/h5diff/testh5diff_basic.c b/tools/h5diff/testh5diff_basic.c
index 4036f29836..389744d55c 100644
--- a/tools/h5diff/testh5diff_basic.c
+++ b/tools/h5diff/testh5diff_basic.c
@@ -272,8 +272,8 @@ int test_basic(const char *file1, const char *file2)
  write_dset(group2_id,2,dims,"dset1",H5T_NATIVE_DOUBLE,data2);
 
  /* integer relative */
- write_dset(group1_id,2,dims,"dset2",H5T_NATIVE_INT,data5);
- write_dset(group1_id,2,dims,"dset4",H5T_NATIVE_INT,data6);
+ write_dset(group1_id,2,dims,"dset5",H5T_NATIVE_INT,data5);
+ write_dset(group1_id,2,dims,"dset6",H5T_NATIVE_INT,data6);
 
 /*-------------------------------------------------------------------------
  * Close
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 5f28c2bcde..9c7368f00d 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -233,6 +233,14 @@ hsize_t diff_datasetid( hid_t dset1_id,
   cmp=0;
   options->not_cmp=1;
  }
+
+/*-------------------------------------------------------------------------
+ * only attempt to compare if possible
+ *-------------------------------------------------------------------------
+ */
+ if (cmp)
+ {
+
 /*-------------------------------------------------------------------------
  * get number of elements
  *-------------------------------------------------------------------------
@@ -249,25 +257,8 @@ hsize_t diff_datasetid( hid_t dset1_id,
   nelmts2 *= dims2[i];
  }
 
- if (cmp)
-  /* onnly assert if the space is the same */
-  assert(nelmts1==nelmts2);
-
-/*-------------------------------------------------------------------------
- * check for equal file datatype; warning only
- *-------------------------------------------------------------------------
- */
-
- if ( (H5Tequal(f_type1, f_type2)==0) && options->m_verbose && obj1_name)
- {
-  printf("Warning: Different storage datatype\n");
-  printf("<%s> has file datatype ", obj1_name);
-  print_type(f_type1);
-  printf("\n");
-  printf("<%s> has file datatype ", obj2_name);
-  print_type(f_type2);
-  printf("\n");
- }
+ /* only assert if the space is the same */
+ assert(nelmts1==nelmts2);
 
 /*-------------------------------------------------------------------------
  * memory type and sizes
@@ -296,13 +287,13 @@ hsize_t diff_datasetid( hid_t dset1_id,
  sign2=H5Tget_sign(m_type2);
  if ( sign1 != sign2 )
  {
-     if (options->m_verbose && obj1_name) {
-	 parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
-	 parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
-     }
-
-     cmp=0;
-     options->not_cmp=1;
+  if (options->m_verbose && obj1_name) {
+   parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
+   parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
+  }
+  
+  cmp=0;
+  options->not_cmp=1;
  }
 
 /*-------------------------------------------------------------------------
@@ -315,35 +306,29 @@ hsize_t diff_datasetid( hid_t dset1_id,
   if ( m_size1 < m_size2 )
   {
    H5Tclose(m_type1);
-
+   
    if ((m_type1=h5tools_get_native_type(f_type2))<0)
-        goto error;
-
+    goto error;
+   
    m_size1 = H5Tget_size( m_type1 );
   }
   else
   {
    H5Tclose(m_type2);
-
+   
    if ((m_type2=h5tools_get_native_type(f_type1))<0)
-        goto error;
-
+    goto error;
+   
    m_size2 = H5Tget_size( m_type2 );
   }
 #if defined (H5DIFF_DEBUG)
   printf("WARNING: Size was upgraded\n");
   if (obj1_name)
-  print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
+   print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
 #endif
  }
  assert(m_size1==m_size2);
 
-/*-------------------------------------------------------------------------
- * only attempt to compare if possible
- *-------------------------------------------------------------------------
- */
- if (cmp)
- {
 
  buf1 = (void *) HDmalloc((unsigned) (nelmts1*m_size1));
  buf2 = (void *) HDmalloc((unsigned) (nelmts2*m_size2));
diff --git a/tools/testfiles/file1.h5 b/tools/testfiles/file1.h5
index 51808c40ae5525d91189e757324b400b33667996..fedeac45edb1b85dcd3c3872b7e973c7d546fd04 100644
GIT binary patch
delta 132
zcmbOrI6-j2Cg%72@)Nf{1yPgdGRlJKy^OLtK)wqDD?>_gYKdt83j-9eF-U+}j0{Nf
yW|P^Nwt+Nm-p|C#2xgpTW@TgtD`9Au{E@YFasq1$jKBFKt0>dN0Jh0&99;lpYa`46

delta 132
zcmbOrI6-j2CgwYV5)-#R1yPgdGRlJKy^OLtK)wqDD?>_gYKc(*3j-9eF-U+}j0{Nf
yCX?Biwt+Nm-p|C#2xgpTW@TgtD`9Au{E@YFasq1$jKBFKt0>dN0Jh0&99;m)uq7`5

diff --git a/tools/testfiles/file2.h5 b/tools/testfiles/file2.h5
index 7c14cf31e469249de639616e2216a745117092b9..18c0b0157822e9f1049631077066757412b0d651 100644
GIT binary patch
delta 122
zcmbOrI6-j2Cgu11@-7Ta4C#g*j0_0C#vlRaFfst;Ctf|u45TK{Wt0Wedm;4ZyNt&f
k*}?i5Dke8F)lSx6=|SOJu)_J9FS434O$=b0%*N3L002862LJ#7

delta 122
zcmbOrI6-j2CgnSU5-to(4C#g*j0_0C#vlRaFfst;Ctf|u45TK{Wt0Wedm;4ZyNt&f
k*}?i5Dke8F)lSx6=|SOJu)_J9FS434O$=b0%*N3L08P^&M*si-

diff --git a/tools/testfiles/file3.h5 b/tools/testfiles/file3.h5
index 3c63d048924dc32fc107738ddfe6339f0fb31f3b..1431f3addab724492d523c6c52008f59a4e2d28b 100644
GIT binary patch
delta 214
zcmZqRZs4A9DfvCWybA*pL%LxE69WRUF-U+pj0`Y&BL`-LGy{fwiJ=AyF8Rr(jQ#9j
za~L`%Z)ED7?7;kLaum~x%~~uRjDBDV7KW7K)DjOyxDjj&0uTo<LLHD}2y!IQVsvpM
JptuoS9{|vL9n1g#

delta 214
zcmZqRZs4A9Dfv#IgbM=`L%LxE69WRUF-U+pj0`Y&BL`-LGy{fwiJ=AyF8Rr(jQ#9j
za~L`%Z)ED7?7;kLaum~x%~~uRjDBDV7KW7K)DjOyxDjj&0uTo<LLHD}2y!IQVsvpM
JptuoS9{^b~9}EBh

diff --git a/tools/testfiles/file4.h5 b/tools/testfiles/file4.h5
index 9b9ebdba75a8586a5aa7417e75404d3c7b481143..b85c07e17c32ae0a4e2a966148fedb6d3c15f55e 100644
GIT binary patch
delta 346
zcmZ1wwjgZ78Aj&!{PLU6Gx9<h_nDxK_smene-<c%pAEv8EYIFOF@R<AH&KJhY=V4~
z->{c#p1@JSKJkIUB!L!?aX=NPCr2?QOx`4@!~*2IOgzvv`4zjwWIhhD$rFTZChG{8
zF(n91-ovB-mG0QQK{$+QvYD9F<OB|b%>iOD%wR<o$ck1?-X!J0Bp?XV2eC%_HIoK{
zt1t7KX$AXa8CkIGW_wv<rpZ#WN>HVXCtE2bfjv840qT+UimxXZ$%7Sa-metO1a&*m
qcWj$isO|xW$mID7TPMqCM1bW$Y#mKA#)QecnG{h(DnKGI&j0{DrE+`#

delta 341
zcmZ1wwjgZ78Aj$iffAd~Gx9<h_nDxK_smene-<c%pAEv8EYIFOSxC@f@+<bT$qHfy
zn-e$+*e40JumBBmnRuXU@+@(^$(0fUlLG`1VyA#&6NGFg?@=*hN)VbXBdY*a-m!Uu
za2V6%ee4QAEHIf(Olot0SPU~*p@1Ng!c~(uNqI1>V4u8)Nde^M$@0>#nGPVh`ZBL4
z7s)Guy<;zH%rtqH5|{&2w|KIZLK0YFz5>(_>lI%!C2)X@2aE4l3T1*A%HF?und&}p
iU`(E`uywMGMg&*_#MaR?W1KK~H<KcY$O@1M%r^ilqjm}a

diff --git a/tools/testfiles/file5.h5 b/tools/testfiles/file5.h5
index ffde01bee3b52840a07abd7f4bf7ba171d6665ee..2cf5163fd543796d8739ca644f9fd0bd0fdf837e 100644
GIT binary patch
literal 17624
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

literal 18008
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
VBKiX8G9OXqBkGt3|8Mz-e*?*7{p<h$

diff --git a/tools/testfiles/file6.h5 b/tools/testfiles/file6.h5
index 795ab83028b5e51adfd6da78c999dc85b77f8b25..d421db6f320120dadf24a58e23b4ff5a033760d2 100644
GIT binary patch
literal 17624
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

literal 18008
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
M0HO3p%&*b^0SvZ6zyJUM

diff --git a/tools/testfiles/file7.h5 b/tools/testfiles/file7.h5
index 2f48a22fedf3fc4afd3390572155e882582ad5ec..0fa727e6359a8b19ade0f0c2d8b22f044d478f45 100644
GIT binary patch
delta 2298
zcmZ8jO>7%Q6y8}owv#x?I<~Xk{Ou-nME**hC?%xI&!o6%6jjKHDuhy`nyR^QX+k*=
zL1lyB!pY79!GWR_fdG*Tx4!g%L~^NmYLcQ}3Q~)>AcT~py;Kw_yf-_$wRfzYZ@%~D
z&Ad1BX2!RQ>{gK#ZXVfdGSiA*xp;Z$omr+hC7>iklPRb#-rw^fz_uUCi|Qf^3LB*W
z(~X}&#{WJk%iI1ACVK7FTxVgp8kmBoQLUKK;J?5mbSGP-l~p|Gfqc-PmQ!(`GpC~Q
z8n>O`LAP!3TDP6#^=`YDLm?W2--Ft56@~PbqPCVIp^s#5UQjMBDNM!Rci-4*Md7{&
zSD-J{1y*w^$N079^1D}L8{K*KIAjxa=M%>k-ErmU&gUP>{=K~6?%^*s8RSjwm?<7{
z=N;xzUrzQP;qh(Jp9C*)-8Fcb8?M0#-WGHW#(BrggfyPyrfgv>yvwzn=0{xlN#0{m
zfRb1E3%@$Sq<Np){}dk>Fjl3>3_t1`oaV>)HK?t-pR-U)Yw4^lO<c)4J-p4s+daGk
zdF5WkJ-nrw=M=qKAX2k(0K=niMNV1eI8517$?H6vGOAJ^uHv}*4OId~X+-YF&zYdf
z!!-|&czCmiQ_@zB7enr3udjSA{H+gmd|yMiworBSw8)p@#F>+q;cU1Cmiv1l+x(I2
zlZRdQF)T-4hu)aRRM?8@21Q9lX0@1<&YU0SV<xMC6|4i$71LRe`m+!mU|kD0;wGzu
zU99Wj0P8SBT1?geLs&P$Jl0LHg0%)ktRrv(>t@)+Itm9^#~`AcEDl|9-JtEI;`l&F
zJEX%rYVB+1xt8{VmfwI6;`$KnEEUI=7Md29QjQ8OA{8gjc3?5xpoF91Xq{W86Sgo?
zQ$%V}q>$;Wg)v>Hn+vjf2)@uYmV_<cgaWcVdIG-JEunpc9DA)LgqZb<PASO-1<OkI
zqCEhzzl;P+!5@YRo01I+wlCR;V3r{!1}-rxF)wjl;-<t$h~!GE0I(!-iCKwxiR*|I
z*GUoaj$~<aa;?n{GSOxSnL$oVv24rPoQPyyvNMA1NcO52pj`wBr7;^*HfIYWu&iWf
z1uGy!KcFOWN8-Ljt;5!*BxVqWGZG6DOA>b^?%P<_I_m<sFKx*#@jgu@C&c?y&h^|=
z&to<?hnI4x@;ak;r}B0QcsS)&<!wP(Rmmy4%B9{j3|<STVJ<Wa`H`0LSN*r0chf$Y
z`-AqodFg1pTA>~LRGjME=zB27tonC_cP;2r)vLOZnuNvCZqc=A2<jH-R>P8Ku)z{?
zgjFaFEWq0EqF92x;p5I!S-c#U%7u}e4E|2pgB*_k0NUuB`m_(;7`5a8PvF70t^O&p
z0)>%4xp8cR!M_u>@ZpI+Ro+kit1q4Lw=lir%ERIKGq&h5bMk8S--Gt48TIWD{G7J@
z^uGcw4J2TF>O$?BeDpWrM`lzFU*a1gp7Yb^eCoY=G8OJVO#h}n4#PhwNl!gd7aCle
M8(l3gpPps^1Ko_@`v3p{

delta 2398
zcmZ8jO-vhC5Z<>o#^!g84Qpe-O9QHbL^y~5MFbuM5{g>Mq-}&~)c^`onoA7Lp;0T@
zm!4}g$*olMP^nd^;>1#fsz?c!s<&XIR+SP7)ZVH}K<S}UtJ0abZ}ILv%k%B`W_I42
z_cOCwdA5~jxkqPS&PFB`uX5wV<vY_%v6@ebh)1TNKL68!2LYaYp*XM3vr6%fl7sEq
z`;hW}LdxQEZz~g42NmBj4c2{Qa8uXvDGmPhjWPqiWl{N_kw5ALqagxXcM@`;FubhP
zF4E8{{tF><3iNFCEiNfHmKCPr@2``m8Pk9y_m~{o{q4ZJr!(x(rGM-3{q9qHjaNAI
z5ng$!qX&Zr9QGZ&+F_sIwMQpU%ZqfD*JrQUJR~zb=y1@-L;t;FGwA1yHl`>8Tt|oH
zfQEP!-~aU%TQbdtdCZ|7;jIpTqdcB^+vYLDdHbJshvWPVs>?H;;GM|5r>|V%uhK%F
zwn^Ug`UkcZo8mp_uWWLepL0y$3h({e79e~Uc%BKMHyY8}$toAGcJUe)uXXV{<TL}z
zU%iWKPM%SM&JLx)#p#6E9fpy6@NW%3dt~QLF0Q*c-ITID?q<}{p(xGBY0a$xVlLj|
z;;k;;=HhV|H;`L*#Z!Dy{gr1;yW_Z|TJUpmHy;F7;gY`>QVsW{J_{xGDWpSla5Jni
z6}Ce<^FT@0nHLtrI;#*pJ~+buN(hAG%nw~C1Hz_?Y@)QI)U0!5otGN;vPqB9ep0iv
z7S=(jNoVyCL>t;eYJL+0(m4vkIBIDFsaaY&G2}G_E2yRIqh@Kz7af5{$m2Yl;2}yK
zN+=_6gfa@j#yD$+^C)95i?Rh)P_{xIWg9$18HW-|1CAQwkkk#zWU!$7;TK(F9U}5h
zSk!gcLY+SnVF_T7_*z65fFY4fT#%TRxFPWwB01hSaV=_6Ln4>BATf(bV-3()P>^g$
zuzksf1=E`S@FQA|z&2WP$wmcBOU4D;Kt?f5h-h{sn-mdFiM~Y4jBr|bPRGm;a}o;@
zcO)K4)LKltBqD{Fl9-m5lUR_rBk>TCV!S3sGg?hHCs<0ddBL*CD8~0h90keV7i?d$
z1!6_5t;)yxAlA_?>eN`rMNy}Una*AH`msG*Vm&FX+p-_l3x^)-#RYr1#d=|85;}g^
zuwHoV`UEc)5^u0Kt$R;N!k!uFCfE~Eg^T-;mlKPkP_^>FY$60dSBGJ!ApyC5U-66X
zAFPUOUgpEIW<|bzuF<K`dhdxWkQw|KW|&d^k(f;rPQg*HH<P0<G4P5otv?S{yOhDP
zWf^R;i1ct53O!e0t#4i|>OtQHYp4ZGD9goM|0AaU-33pk4DrIr$Ty%3&cN?U({E<*
zSe@&JmJU<>Ah;r8se5gcsp)e6-tcegj353;8qRbzatl_6Oiw2x|G@Xd=5u^>-TCR!
zGIqIYO(q6&`d<2Wf!jS1*ce+1G|14N**;IqMJ(`55!v<ecRlLW8hA2k&UA0`g}PdM
U8rR;`vASEPnZdio^p$D$Kb<A#!2kdN

diff --git a/tools/testfiles/file8.h5 b/tools/testfiles/file8.h5
index d1379114118880a361b2f1420c6cd6f026287b49..ff2c51b4832b524da4b7656570eb8b99c4890030 100644
GIT binary patch
delta 2146
zcmZ{lO>7%Q6vuZqTiZ$8W)nNM^XYAIrF;}{qgEy;O<V{N1%zCSL*;_75WOIwrqDxE
zsB9r|;bi-PxKPQJkoZc~rF-cCsX^kvsc}I_s2o~}8$!yqy&zgCym|BNj2BpW{omir
zn>X+6?3=k>7uV~ecI~n4f%LLr8E?LO`rL{z+E>U((W5Z1zy8a14+?Bq;FZjh2-6s&
z1}CDQK*4%nc6wXZgdnT!Jy%2&E`^rh$CzC&*zhQ{2nRBwJj#Jv;%!)q+3;&Pe$>QS
z<n6}P%)1d7#)S*=N7omhE0zDZFV^oBEBVX2EjKUjK0mx4>A*+YD82pD4>~5s&7B(^
z(0%GN_Eb71#+I^wmRkOAKv)~_t-l+PZlAwgKb}}*cjWD7Ep**-cKu(|^XzaVJOb62
z^B=cek*~7-S{;1WIUV510FMQDJirsk`mzlNIAIu-E`wyiKz?1igOLD_BKP3kPM|ly
zeF5$da1`h7a<DgGun*b7yFI}`fb9Se26!mI^83~O#l8KLhpmQvuB%w=!Oy5zt_~h;
zS5Xz~;X|y4lQ0#xg$duslHkW8L>8Qgr@@Iw;AA`nPsJTsQm}?BwWiudA6acOMTvZ-
zeagdd1kNW?keyaqP%MVvY$6R+rZ|y{gpojt)n~O6sy)kEU|mC{Xjom=7OT%{CzV}c
zx)<h?Ng7keHkoyXqO2jwJikn;JnyOzjTAMD88XT;9U>|-J)s;RVVWXKiEJ{>5&29<
zh@26XOrEvOT4imrZnEA*#UvY}DhG!(&st`!vNlm=UeC~KwwRV>kc}~wWNJ($SwN;m
zRqbMxGHEisMATw>nH-F(HFW2BO%;nGC01s7g{X!k*V1KevHGm`gzC?-7Emb|)*7qJ
z+G6#UdiG>r2-jsSv!A}|rOYup0=&w>Tjp!}ej~R)ox{j_`G*25OJ6U4Sy?*o@vcn0
zC>mk~TA3jzN9ORhpgEQDnlnFiSC)TBolj>TAMWn3pZu84t4i)YSQSqHd5SQBVRfBe
z8`(uD<qnYPz+vbs%B=^ls(=lVVh`)!&K99DSEBc@J=dx3GFJC#uXf~`fIqUz$<D%8
zVCPoNzoy~UoWl+t!0iRqeRc3GxKk0&p8s0F-^Wzrou_{{^E1+(w-eqq7T&^dj9)+O
zEIbsY4y6|_bsxjyOV69{MBuw+$CBqaoS98QbLoxVhTL26+JtY!NSAvzzd`xDe*9FA
j`BT3fO5xsF{>{7}g+H^5&pj}UdplUkt$S-PtcZUAA6?tv

delta 2200
zcmZvdO=ufO6vubgvaC2?t7v7dZQ0&5N^q2vswRz7*R^HWZXKT#w*;enDItM2q(n_a
zY0`q!L+`tK4Ybe{oeHHc7Fh@;2_(6M-l7;v3oY2tTPavhawxRm&b)b&cZV!m{`;FZ
zGjIOdeKSigTXLCmYtJ9YtSK#|o&Wg4)fuKWudrs}Bhz@?{bj9<3p@^im)G;G1IK6%
zJdECeT<CKV^d5)$81`Cg|A`rJGdvDI#|$@Tz<=Q}X2XxHo5tDjgnbCbm;t|am~V)j
zI=^c%nOi(Juj|(}{=@6}#{E*WS*T!leGg>QM^g<Y_U`Q)X@6f4cPEl_FKYMqTi>|9
z`48~G_b2^PO;g7&=iQ0^OMFydWxUs=Z$7!$8mh*Z^Q{m*oOmzDPnG$2w6!WYYnqe(
ze@F~H`a#expCHghO;|n-cRTu^9J60=8zqsf`7*Xp@+NmGyj9_C3U60<2WS7w-l?#m
zX{A7isM2AV!s4UxPiS&(<9BnxafQ1SPAF{g{DBF&l@2|eL;P+g=v6qWaG%2c3J)l3
zdtdBZWS+CH%3zh9s~A@U)n-J$#cErOzSb<mGB2kuc{$C)`=-Hkco<7SBNjml@ed}!
z+OciMwBc*hVi9o70dP$00X5P(X@k^=%Xo$~$CcMJ6iFS@8fl%hL27hGFk2U9%Mw{g
zMWP<0DyR9l#gcF=J^*#1enFK4hM<v_nn~EWhyrgHW>aWyFWOt;F=1~|Oj@zz>TS|2
zX@Rs%S|xqJRk&M~TIrT(lV(W^q-Cxm*I_hJBRYb#N;HCG^hk4~Xf8`MhEycVB2_sF
zPm}1TPBeuMr?G9YS2~=*nTx&BqC;9Et&=uLjil_C;VLZVNQ<NnX^pf_+TbcY9>;8U
zpQL%D98n&r%t^e!ljx&HbQ)=us36EQ`a8pH2zpby@gp8jy@^MLSK9kThhJF%oI_#n
z_TVHt<==!vJ^NXdpTFkY6%KRu?*SbON8I(dFw=MGN5LX$9F%9-<(K2Zfbq&#c(#>>
zKZ99jZ~YV()Wug3IO!HLV=#I6CG5KMRp?w6`z6213>KJ0Gh73EWDY7rdHfI7hFXPO
z;Dvm_a}M2N`ak>O-n5MaHb#E{V|W(+%E)<3!_V~jG$d0pycqomz3g~>f$7D~_LY%8
z_1Osgov~^EplxFGB3wBlXWAJ37w(M6=Yg@C!9zPa{&r_2;$MD9oceJ2fCbg@b6a+i
xwFka~U8bmI7tq<6i4$%5+%~v3C0DvK^}Bv$d&}3#^fP^V6HCL_yy81E?0==y`5OQL

diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt
index 8a2f3ee4d1..056e486246 100644
--- a/tools/testfiles/h5diff_11.txt
+++ b/tools/testfiles/h5diff_11.txt
@@ -3,7 +3,3 @@ Expected output for 'h5diff file1.h5 file2.h5'
 #############################
 Dataset:     </g1/dset1> and </g1/dset1>
 4 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -v for a list of objects.
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index d498276000..53f44c1a06 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -9,7 +9,3 @@ position        dset1           dset1           difference
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
 4 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -v for a list of objects.
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index 115547cf5c..88047c9d47 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -6,9 +6,11 @@ file1     file2
 ---------------------------------------
     x      x    /g1            
     x      x    /g1/dset1      
-    x      x    /g1/dset2      
+           x    /g1/dset2      
     x           /g1/dset3      
-    x      x    /g1/dset4      
+           x    /g1/dset4      
+    x           /g1/dset5      
+    x           /g1/dset6      
            x    /g2            
 
 Group:       </g1> and </g1>
@@ -21,22 +23,5 @@ position        dset1           dset1           difference
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
 4 differences found
-Dataset:     </g1/dset2> and </g1/dset2>
-Comparison not possible: </g1/dset2> is of class H5T_INTEGER and </g1/dset2> is of class H5T_FLOAT
-Warning: Different storage datatype
-</g1/dset2> has file datatype H5T_STD_I32LE
-</g1/dset2> has file datatype H5T_IEEE_F64LE
-Comparison not supported: </g1/dset2> has sign H5T_SGN_2 and </g1/dset2> has sign H5T_SGN_ERROR
-0 differences found
-Dataset:     </g1/dset4> and </g1/dset4>
-Comparison not possible: </g1/dset4> is of class H5T_INTEGER and </g1/dset4> is of class H5T_FLOAT
-Warning: Different storage datatype
-</g1/dset4> has file datatype H5T_STD_I32LE
-</g1/dset4> has file datatype H5T_IEEE_F64LE
-Comparison not supported: </g1/dset4> has sign H5T_SGN_2 and </g1/dset4> has sign H5T_SGN_ERROR
-0 differences found
 Group:       </> and </>
 0 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt
index 0827f0dc10..e76231e0bc 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/testfiles/h5diff_50.txt
@@ -5,9 +5,6 @@ Dataset:     </dset0a> and </dset0b>
 Warning: Different storage datatype
 </dset0a> has file datatype H5T_STD_I16LE
 </dset0b> has file datatype H5T_STD_I32LE
-Warning: Different storage datatype
-</dset0a> has file datatype H5T_STD_I16LE
-</dset0b> has file datatype H5T_STD_I32LE
 position        dset0a          dset0b          difference          
 ------------------------------------------------------------
 [ 1 0 ]          1               3               2              
diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt
index 24100d6844..814ae9a296 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/testfiles/h5diff_53.txt
@@ -2,12 +2,6 @@
 Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b'
 #############################
 Dataset:     </dset3a> and </dset4b>
-Warning: Different storage datatype
-</dset3a> has file datatype H5T_STD_I32LE
-</dset4b> has file datatype H5T_STD_I64LE
-Warning: Different storage datatype
-</dset3a> has file datatype H5T_STD_I32LE
-</dset4b> has file datatype H5T_STD_I64LE
 position        dset3a          dset4b          difference          
 ------------------------------------------------------------
 [ 1 0 ]          1               3               2              
diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt
index 32ced1c913..82c0afcbf3 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/testfiles/h5diff_57.txt
@@ -5,11 +5,15 @@ Dataset:     </dset7a> and </dset7b>
 Warning: Different storage datatype
 </dset7a> has file datatype H5T_STD_I8LE
 </dset7b> has file datatype H5T_STD_U8LE
-Warning: Different storage datatype
-</dset7a> has file datatype H5T_STD_I8LE
-</dset7b> has file datatype H5T_STD_U8LE
 Comparison not supported: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
-0 differences found
+position        dset7a          dset7b          difference          
+------------------------------------------------------------
+[ 0 0 ]          -1              1               2              
+[ 1 0 ]          -1              1               2              
+[ 1 1 ]          -1              1               2              
+[ 2 0 ]          -1              1               2              
+[ 2 1 ]          -1              1               2              
+5 differences found
 --------------------------------
 Some objects are not comparable
 --------------------------------