diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-07-13 20:09:28 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-07-13 20:09:28 (GMT) |
commit | 9a221fd979a08cc81256eecc767ab4b96527de08 (patch) | |
tree | b2a58539404c4184dca5f48fa97cd3f9dd8b3894 | |
parent | 3fa1cc47008998f2b6d69276724cdb67b4103596 (diff) | |
parent | b087e6d3a87481173f647070c721d048775c0c93 (diff) | |
download | hdf5-9a221fd979a08cc81256eecc767ab4b96527de08.zip hdf5-9a221fd979a08cc81256eecc767ab4b96527de08.tar.gz hdf5-9a221fd979a08cc81256eecc767ab4b96527de08.tar.bz2 |
Merge branch 'develop' into gnu-flags-work
-rw-r--r-- | fortran/src/CMakeLists.txt | 9 | ||||
-rw-r--r-- | hl/test/test_dset_append.c | 4 | ||||
-rw-r--r-- | src/H5FDmulti.c | 24 | ||||
-rw-r--r-- | tools/test/perform/CMakeTests.cmake | 4 |
4 files changed, 24 insertions, 17 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 774ed8c..315dc85 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -356,8 +356,13 @@ install ( ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h - ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h - ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 + if (NOT ONLY_SHARED_LIBS) + ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h + ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 + else () + ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h + ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90 + endif () DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c index 9d466b5..8bb4f84 100644 --- a/hl/test/test_dset_append.c +++ b/hl/test/test_dset_append.c @@ -691,7 +691,7 @@ test_dataset_append_BUG1(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DBUGNAME1, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DBUGNAME1, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -853,7 +853,7 @@ test_dataset_append_BUG2(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DBUGNAME2, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DBUGNAME2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index acd128c..800869d 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1966,30 +1966,30 @@ compute_next(H5FD_multi_t *file) static int open_members(H5FD_multi_t *file) { - char tmp[H5FD_MULT_MAX_FILE_NAME_LEN]; - int nerrors=0; + char tmp[H5FD_MULT_MAX_FILE_NAME_LEN]; + int nerrors = 0; static const char *func="(H5FD_multi)open_members"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); UNIQUE_MEMBERS(file->fa.memb_map, mt) { - if(file->memb[mt]) + if(file->memb[mt]) continue; /*already open*/ - assert(file->fa.memb_name[mt]); + assert(file->fa.memb_name[mt]); /* Note: This truncates the user's filename down to only sizeof(tmp) * characters. -QK & JK, 2013/01/17 */ - snprintf(tmp, sizeof(tmp), file->fa.memb_name[mt], file->name); + sprintf(tmp, file->fa.memb_name[mt], file->name); tmp[sizeof(tmp) - 1] = '\0'; - H5E_BEGIN_TRY { - file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF); - } H5E_END_TRY; - if(!file->memb[mt]) { - if(!file->fa.relax || (file->flags & H5F_ACC_RDWR)) - nerrors++; - } + H5E_BEGIN_TRY { + file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF); + } H5E_END_TRY; + if(!file->memb[mt]) { + if(!file->fa.relax || (file->flags & H5F_ACC_RDWR)) + nerrors++; + } } END_MEMBERS; if (nerrors) H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1) diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index 45f43b4..20e7f59 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -170,7 +170,9 @@ endif () set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects") if (H5_HAVE_PARALLEL) - add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS}) + if (UNIX) + add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS}) + endif () add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS}) |