mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-24 15:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #913 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit '5a8ac1fb6c13e776bc17fa52c4cdf353c907907b':
  Fix test loop
  Correct if-endif block
  Remove option from list in doc
  Remove t_cache_image test on Windows
  Correct use of LIST var
This commit is contained in:
Allen Byrne 2018-03-01 12:30:55 -06:00
commit f1ee4825f9
4 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/jni/h5dImp.c
View File

@ -1019,7 +1019,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL
} /* end else */
return (jint)status;
} /* end Java_hdf_hdf5lib_H5_H5Dread_1VLStrings */
} /* end Java_hdf_hdf5lib_H5_H5Dread_1VL */
herr_t
H5DreadVL_asstr

1
release_docs/INSTALL_CMake.txt
View File

@ -571,7 +571,6 @@ HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols"
HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" OFF
HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON
HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON
HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON
HDF5_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF
HDF5_ENABLE_TRACE "Enable API tracing capability" OFF
HDF5_ENABLE_USING_MEMCHECKER "Indicate that a memory checker is used" OFF

4
test/CMakeVFDTests.cmake
View File

@ -88,7 +88,7 @@ endif ()
links_env
)
if (NOT CYGWIN)
list(REMOVE_ITEM ${H5_VFD_SKIP_TESTS} big cache)
list (REMOVE_ITEM H5_VFD_SKIP_TESTS big cache)
endif ()
# Windows only macro
@ -243,6 +243,7 @@ endif ()
else ()
DO_VFD_TEST (${test} ${vfdname} ${resultcode})
endif ()
endif ()
endforeach ()
set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1)
set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10)
@ -294,7 +295,6 @@ endif ()
)
endif ()
endif ()
endif ()
endmacro ()
# Run test with different Virtual File Driver

4
testpar/CMakeTests.cmake
View File

@ -18,6 +18,10 @@
add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
if (WIN32)
# t_cache_imagee uses fork() and execve(), will not run on Windows
list (REMOVE_ITEM H5P_TESTS t_cache_image)
endif ()
foreach (testp ${H5P_TESTS})
add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS})
endforeach ()