diff options
| -rw-r--r-- | MANIFEST | 5 | ||||
| -rw-r--r-- | java/src/jni/h5pImp.c | 4 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 19 |
3 files changed, 23 insertions, 5 deletions
@@ -941,6 +941,7 @@ ./test/cross_read.c ./test/dangle.c ./test/deflate.h5 +./test/direct_chunk.c ./test/dsets.c ./test/dt_arith.c ./test/dtypes.c @@ -2589,6 +2590,7 @@ ./tools/test/perform/build_h5perf_alone.sh ./tools/test/perform/build_h5perf_serial_alone.sh ./tools/test/perform/chunk.c +./tools/test/perform/direct_write_perf.c ./tools/test/perform/gen_report.pl ./tools/test/perform/iopipe.c ./tools/test/perform/overhead.c @@ -2666,7 +2668,6 @@ ./hl/test/COPYING ./hl/test/H5srcdir_str.h.in ./hl/test/Makefile.am -./hl/test/dectris_hl_perf.c ./hl/test/dsdata.txt ./hl/test/dslat.txt ./hl/test/dslon.txt @@ -2685,8 +2686,8 @@ ./hl/test/test_ds_be.h5 ./hl/test/test_ds_le.h5 ./hl/test/test_dset_append.c -./hl/test/test_dset_opt.c ./hl/test/test_file_image.c +./hl/test/test_h5do_compat.c ./hl/test/test_image.c ./hl/test/test_ld.c ./hl/test/test_ld.h5 diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c index 49cfeb9..3ff7436 100644 --- a/java/src/jni/h5pImp.c +++ b/java/src/jni/h5pImp.c @@ -5204,10 +5204,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1append_1flush visit_callback = callback_op; if (op_data == NULL) { - h5nullArgument(env, "H5Ovisit: op_data is NULL"); + h5nullArgument(env, "H5Pset_append_flush: op_data is NULL"); } /* end if */ else if (callback_op == NULL) { - h5nullArgument(env, "H5Ovisit: callback_op is NULL"); + h5nullArgument(env, "H5Pset_append_flush: callback_op is NULL"); } /* end if */ else { status = H5Pset_append_flush((hid_t)plist_id, (unsigned)ndims, (const hsize_t*)boundary, (H5D_append_cb_t)H5D_append_cb, (void*)op_data); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a2ade92..517a620 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -200,7 +200,7 @@ set (H5_TESTS cmpd_dset filter_fail extend - direct_chunk + direct_chunk # compression lib link external efc objcopy @@ -252,6 +252,7 @@ macro (ADD_H5_EXE file) endmacro () set (H5_TESTS_MULTIPLE + direct_chunk testhdf5 cache_image ttsafe @@ -266,7 +267,23 @@ endforeach () ############################################################################## ### M U L T I P L E S O U R C E T E S T S ### ############################################################################## +######### Also special handling of link libs ############# +#-- Adding test for direct_chunk +add_executable (direct_chunk ${HDF5_TEST_SOURCE_DIR}/direct_chunk.c) +target_include_directories(direct_chunk PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") +TARGET_C_PROPERTIES (direct_chunk STATIC) +target_link_libraries (direct_chunk PRIVATE ${HDF5_TEST_LIB_TARGET} ${LINK_COMP_LIBS}) +set_target_properties (direct_chunk PROPERTIES FOLDER test) +if (BUILD_SHARED_LIBS) + add_executable (direct_chunk-shared ${HDF5_TEST_SOURCE_DIR}/direct_chunk.c) + target_include_directories(direct_chunk-shared PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + TARGET_C_PROPERTIES (direct_chunk-shared SHARED) + target_link_libraries (direct_chunk-shared PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${LINK_COMP_LIBS}) + set_target_properties (direct_chunk-shared PROPERTIES FOLDER test) +endif () + +######### Special handling for multiple sources ############# #-- Adding test for testhdf5 add_executable (testhdf5 ${testhdf5_SOURCES}) target_include_directories(testhdf5 PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") |