[svn-r16348] #1368 (E1) h5diff: implement "not comparable" messages. Implemented RFC. The new option is <-c, --compare List objects that are not comparable>

added some test cases

tested: windows, linux

1 files changed, 2 insertions, 52 deletions

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 5481d23..8d733b3 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -831,7 +831,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -861,7 +860,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -930,7 +928,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -960,7 +957,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1031,7 +1027,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1061,7 +1056,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1134,7 +1128,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
                             PDIFF(temp1_ushort,temp2_ushort));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1164,7 +1157,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1234,7 +1226,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1264,7 +1255,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1334,7 +1324,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1364,7 +1353,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1435,7 +1423,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
                             ABS(temp1_long-temp2_long));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1465,7 +1452,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1536,7 +1522,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1566,7 +1551,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1637,7 +1621,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1667,7 +1650,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1739,7 +1721,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1772,7 +1753,6 @@ hsize_t diff_datum(void       *_mem1,
                         parallel_print(SPACES);
                         parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -1899,7 +1879,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(SPACES);
                             parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -1953,7 +1932,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
                                 ABS(temp1_float-temp2_float));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -2077,7 +2055,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                                 ABS(temp1_double-temp2_double));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -2130,7 +2107,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                                 ABS(temp1_double-temp2_double));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -2257,7 +2233,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                                 ABS(temp1_double-temp2_double));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -2310,7 +2285,6 @@ hsize_t diff_datum(void       *_mem1,
                             parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                                 ABS(temp1_double-temp2_double));
                         }
-                        options->not_cmp=1;
                         nfound++;
                     }
 
@@ -2863,7 +2837,6 @@ hsize_t diff_float(unsigned char *mem1,
                         parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
                             ABS(temp1_float-temp2_float));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -2925,7 +2898,6 @@ hsize_t diff_float(unsigned char *mem1,
                         parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
                             ABS(temp1_float-temp2_float));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
 
@@ -3073,7 +3045,6 @@ hsize_t diff_double(unsigned char *mem1,
                     parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                         ABS(temp1_double-temp2_double));
                 }
-                options->not_cmp=1;
                 nfound++;
             }
 
@@ -3118,7 +3089,6 @@ hsize_t diff_double(unsigned char *mem1,
                     parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                         ABS(temp1_double-temp2_double));
                 }
-                options->not_cmp=1;
                 nfound++;
             }
 
@@ -3252,7 +3222,6 @@ hsize_t diff_ldouble(unsigned char *mem1,
                     parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                         ABS(temp1_double-temp2_double));
                 }
-                options->not_cmp=1;
                 nfound++;
             }
 
@@ -3297,7 +3266,6 @@ hsize_t diff_ldouble(unsigned char *mem1,
                     parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
                         ABS(temp1_double-temp2_double));
                 }
-                options->not_cmp=1;
                 nfound++;
             }
 
@@ -3430,7 +3398,6 @@ hsize_t diff_schar(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
                      ABS(temp1_char-temp2_char));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3475,7 +3442,6 @@ hsize_t diff_schar(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
                      ABS(temp1_char-temp2_char));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3610,7 +3576,6 @@ hsize_t diff_uchar(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
                      PDIFF(temp1_uchar,temp2_uchar));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3655,7 +3620,6 @@ hsize_t diff_uchar(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
                      PDIFF(temp1_uchar,temp2_uchar));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3787,7 +3751,6 @@ hsize_t diff_short(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
                      ABS(temp1_short-temp2_short));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3834,7 +3797,6 @@ hsize_t diff_short(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
                      ABS(temp1_short-temp2_short));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -3967,7 +3929,6 @@ hsize_t diff_ushort(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
                      PDIFF(temp1_ushort,temp2_ushort));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4014,7 +3975,6 @@ hsize_t diff_ushort(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
                      PDIFF(temp1_ushort,temp2_ushort));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4148,7 +4108,6 @@ hsize_t diff_int(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
                      ABS(temp1_int-temp2_int));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4195,7 +4154,6 @@ hsize_t diff_int(unsigned char *mem1,
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
                      ABS(temp1_int-temp2_int));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4328,7 +4286,6 @@ hsize_t diff_uint(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4374,7 +4331,6 @@ hsize_t diff_uint(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4511,7 +4467,6 @@ hsize_t diff_long(unsigned char *mem1,
                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
                      ABS(temp1_long-temp2_long));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4558,7 +4513,6 @@ hsize_t diff_long(unsigned char *mem1,
                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
                      ABS(temp1_long-temp2_long));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4698,7 +4652,6 @@ hsize_t diff_ulong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4744,7 +4697,6 @@ hsize_t diff_ulong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4877,7 +4829,6 @@ hsize_t diff_llong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -4921,7 +4872,6 @@ hsize_t diff_llong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -5055,7 +5005,6 @@ hsize_t diff_ullong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -5101,7 +5050,6 @@ hsize_t diff_ullong(unsigned char *mem1,
                  parallel_print(SPACES);
                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
              }
-             options->not_cmp=1;
              nfound++;
          }
 
@@ -5449,6 +5397,8 @@ my_isnan(dtype_t type, void *val)
         double x;
         HDmemcpy(&x, val, sizeof(double));
         retval = (x!=x);
+        //printf("x=%g retval =%d\n", x,retval);
+
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
     }
     else if (FLT_LDOUBLE==type)