diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-29 21:39:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-29 21:39:25 (GMT) |
| commit | c5e2d975734d6e7a88fb48b76ec7e11d0a7763de (patch) | |
| tree | 4e71abdc2784be2af5af67d618de3aa8b2bc26c2 /tools | |
| parent | 1eb6a4512ba275681b075e96c7be92511a6b8b2b (diff) | |
| download | hdf5-c5e2d975734d6e7a88fb48b76ec7e11d0a7763de.zip hdf5-c5e2d975734d6e7a88fb48b76ec7e11d0a7763de.tar.gz hdf5-c5e2d975734d6e7a88fb48b76ec7e11d0a7763de.tar.bz2 | |
Small fixes for tools and skip autotools tests for no filter
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/h5diff_array.c | 8 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 1 | ||||
| -rw-r--r-- | tools/src/h5diff/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index a2e0d21..52bae51 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -371,9 +371,7 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start } /* i */ close_member_types(&members); } /* switch */ - H5TOOLS_DEBUG("diff_array finish:%d - errstat:%d", nfound, opts->err_stat); - - H5TOOLS_ENDDEBUG(": %d", nfound); + H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat); return nfound; } @@ -2216,9 +2214,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank, done: opts->err_stat = opts->err_stat | ret_value; - H5TOOLS_DEBUG("diff_datum finish:%d - errstat:%d", nfound, opts->err_stat); - - H5TOOLS_ENDDEBUG(""); + H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat); return nfound; } diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 087414d..5ad29fc 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -152,7 +152,6 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t unsigned i; herr_t ret_value = SUCCEED; - H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat); if(H5Oget_info3(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) { diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt index c1021e4..2009a14 100644 --- a/tools/src/h5diff/CMakeLists.txt +++ b/tools/src/h5diff/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT ONLY_SHARED_LIBS) ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ) target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - #target_compile_definitions(h5diff PRIVATE H5_TOOLS_DEBUG) + #target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5diff STATIC) target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5diff PROPERTIES FOLDER tools) @@ -24,7 +24,7 @@ if (BUILD_SHARED_LIBS) ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ) target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - #target_compile_definitions(h5diff-shared PRIVATE H5_TOOLS_DEBUG) + #target_compile_definitions (h5diff-shared PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5diff-shared SHARED) target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (h5diff-shared PROPERTIES FOLDER tools) |