diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-19 20:09:06 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-19 20:09:06 (GMT) |
commit | 67ba5eb6e8a71a110d47fd3079edcc1fe09fb95f (patch) | |
tree | 92735056c19013281c6ba687e836ed59772e2f3e /tools/h5diff | |
parent | 02eab2eb72a18fa685545ba7c7c5ac7715693d1b (diff) | |
download | hdf5-67ba5eb6e8a71a110d47fd3079edcc1fe09fb95f.zip hdf5-67ba5eb6e8a71a110d47fd3079edcc1fe09fb95f.tar.gz hdf5-67ba5eb6e8a71a110d47fd3079edcc1fe09fb95f.tar.bz2 |
[svn-r25333] Bring revisions #24948 - #25120 from trunk to revise_chunks.
Tested on jam, ostrich, koala, platypus.
Diffstat (limited to 'tools/h5diff')
-rw-r--r-- | tools/h5diff/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 1 | ||||
-rw-r--r-- | tools/h5diff/h5diff_common.c | 7 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_101w.txt | 22 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_102w.txt | 20 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_tmp1.txt | 5 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_tmp2.txt | 13 | ||||
-rw-r--r-- | tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 | bin | 0 -> 124440 bytes | |||
-rw-r--r-- | tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 | bin | 0 -> 119464 bytes | |||
-rw-r--r-- | tools/h5diff/testfiles/tmptest.he5 | bin | 0 -> 4740424 bytes | |||
-rw-r--r-- | tools/h5diff/testfiles/tmptest2.he5 | bin | 0 -> 4734280 bytes | |||
-rw-r--r-- | tools/h5diff/testh5diff.sh.in | 10 |
12 files changed, 59 insertions, 25 deletions
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 5620968..35c55a4 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -55,9 +55,9 @@ endif (BUILD_TESTING) ############################################################################## ############################################################################## -#-----------------------------------------------------------------------------
-# Rules for Installation of tools using make Install target
-#-----------------------------------------------------------------------------
+#----------------------------------------------------------------------------- +# Rules for Installation of tools using make Install target +#----------------------------------------------------------------------------- #INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications) diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index f012f67..08008d7 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -514,7 +514,6 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index 59cab0d..a371cc0 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -103,6 +103,13 @@ void parse_command_line(int argc, /* NaNs are handled by default */ options->do_nans = 1; + /* not Listing objects that are not comparable */ + options->m_list_not_cmp = 0; + + /* initially no not-comparable. */ + /**this is bad in mixing option with results**/ + options->not_cmp=0; + /* init for exclude-path option */ exclude_head = NULL; diff --git a/tools/h5diff/testfiles/h5diff_101w.txt b/tools/h5diff/testfiles/h5diff_101w.txt index d1f49da..71f4e87 100644 --- a/tools/h5diff/testfiles/h5diff_101w.txt +++ b/tools/h5diff/testfiles/h5diff_101w.txt @@ -1,11 +1,11 @@ -dataset: </g1/d1> and </g1/d2>
-size: [3x2] [3x2]
-position d1 d2 difference
-------------------------------------------------------------
-[ 0 1 ] 1e-016 4e-016 3e-016
-[ 1 0 ] 1e-016 2e-016 1e-016
-[ 1 1 ] 0 1e-016 1e-016
-[ 2 0 ] 3.3e-016 1e-016 2.3e-016
-[ 2 1 ] 1e-016 0 1e-016
-5 differences found
-EXIT CODE: 1
+dataset: </g1/d1> and </g1/d2> +size: [3x2] [3x2] +position d1 d2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-016 4e-016 3e-016 +[ 1 0 ] 1e-016 2e-016 1e-016 +[ 1 1 ] 0 1e-016 1e-016 +[ 2 0 ] 3.3e-016 1e-016 2.3e-016 +[ 2 1 ] 1e-016 0 1e-016 +5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_102w.txt b/tools/h5diff/testfiles/h5diff_102w.txt index dda3581..19a097c 100644 --- a/tools/h5diff/testfiles/h5diff_102w.txt +++ b/tools/h5diff/testfiles/h5diff_102w.txt @@ -1,10 +1,10 @@ -dataset: </g1/fp1> and </g1/fp2>
-size: [3x2] [3x2]
-position fp1 fp2 difference
-------------------------------------------------------------
-[ 0 1 ] 1e-007 2e-007 1e-007
-[ 1 0 ] 1e-007 3e-007 2e-007
-[ 1 1 ] 2.2e-007 1e-007 1.2e-007
-[ 2 0 ] 1e-007 0 1e-007
-4 differences found
-EXIT CODE: 1
+dataset: </g1/fp1> and </g1/fp2> +size: [3x2] [3x2] +position fp1 fp2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-007 2e-007 1e-007 +[ 1 0 ] 1e-007 3e-007 2e-007 +[ 1 1 ] 2.2e-007 1e-007 1.2e-007 +[ 2 0 ] 1e-007 0 1e-007 +4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_tmp1.txt b/tools/h5diff/testfiles/h5diff_tmp1.txt new file mode 100644 index 0000000..40e3fb6 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_tmp1.txt @@ -0,0 +1,5 @@ +-------------------------------- +Some objects are not comparable +-------------------------------- +Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_tmp2.txt b/tools/h5diff/testfiles/h5diff_tmp2.txt new file mode 100644 index 0000000..a2d6da6 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_tmp2.txt @@ -0,0 +1,13 @@ +dataset: </G/down/Data> and </G/down/Data> +1599 differences found +dataset: </G/down/Tail/array> and </G/down/Tail/array> +8 differences found +dataset: </G/up/Data> and </G/up/Data> +1845 differences found +dataset: </G/up/Tail/array> and </G/up/Tail/array> +10 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- +Use -c for a list of objects. +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 Binary files differnew file mode 100644 index 0000000..bbcfb63 --- /dev/null +++ b/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 Binary files differnew file mode 100644 index 0000000..6b19ed7 --- /dev/null +++ b/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 diff --git a/tools/h5diff/testfiles/tmptest.he5 b/tools/h5diff/testfiles/tmptest.he5 Binary files differnew file mode 100644 index 0000000..edcfcd2 --- /dev/null +++ b/tools/h5diff/testfiles/tmptest.he5 diff --git a/tools/h5diff/testfiles/tmptest2.he5 b/tools/h5diff/testfiles/tmptest2.he5 Binary files differnew file mode 100644 index 0000000..a6ab02b --- /dev/null +++ b/tools/h5diff/testfiles/tmptest2.he5 diff --git a/tools/h5diff/testh5diff.sh.in b/tools/h5diff/testh5diff.sh.in index 549da49..ee8a09b 100644 --- a/tools/h5diff/testh5diff.sh.in +++ b/tools/h5diff/testh5diff.sh.in @@ -302,6 +302,12 @@ $SRC_H5DIFF_TESTFILES/h5diff_709.txt $SRC_H5DIFF_TESTFILES/h5diff_710.txt $SRC_H5DIFF_TESTFILES/h5diff_80.txt $SRC_H5DIFF_TESTFILES/h5diff_90.txt +$SRC_H5DIFF_TESTFILES/h5diff_tmp1.txt +$SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt +$SRC_H5DIFF_TESTFILES/tmptest.he5 +$SRC_H5DIFF_TESTFILES/tmptest2.he5 +$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.reference.h5 +$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.output.h5 " # @@ -757,6 +763,10 @@ TOOLTEST h5diff_631.txt -v --use-system-epsilon h5diff_basic1.h5 h5diff_basic1.h # 7. attributes # ############################################################################## TOOLTEST h5diff_70.txt -v h5diff_attr1.h5 h5diff_attr2.h5 +# temporary test to verify HDF5-8625 +TOOLTEST h5diff_tmp1.txt tmptest2.he5 tmptest.he5 +# temporary test to verify HDF5-8639 +TOOLTEST h5diff_tmp2.txt tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5 # ################################################## # attrs with verbose option level |