Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge bugfix cmake ph5 example hdf5 1 10 #941

Merged
merged 24 commits into from
Aug 20, 2021
+5 −2
Merged

Merge bugfix cmake ph5 example hdf5 1 10 #941

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c5d3ff5
Revert addition of & to 2 parameters in DSetCreatPropList::setVirtual to
lrknox May 17, 2021
df9c7de
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Jun 3, 2021
426b504
Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)
jhendersonHDF May 12, 2021
da089c5
Removes gratuitous (double)x.yF casts (#632)
derobins May 7, 2021
e2bfcf4
Cleans up a const warning left over from previous constification (#633)
derobins May 7, 2021
a317873
Purges UFAIL from the library (#637)
derobins May 11, 2021
cc05a1e
Bmr dev hdffv 11223 (#640)
bmribler May 12, 2021
59a0ebd
Committing clang-format changes
github-actions[bot] Jun 3, 2021
6ed1a94
Restore "error:" in line 2666.
lrknox Jun 3, 2021
c502c85
Merge branch 'hdf5_1_10' of https://github.com/lrknox/hdf5 into hdf5_…
lrknox Jun 3, 2021
d3a6523
Revert "Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)"
lrknox Jun 3, 2021
8234aac
Snapshot version 1.10 release 8-1. Update version to 1.10.8-2.
lrknox Jul 14, 2021
764cc03
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Jul 14, 2021
ef387ad
Squashed commit of the following:
lrknox Jul 20, 2021
628fcae
Revert references to SIZE_MAX to ((size_t)(-1)) in C header defines u…
lrknox Jul 21, 2021
1bfaf3b
Merge branch 'hdf5_1_10' into hdf5_1_10
lrknox Jul 21, 2021
6cefc9b
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Jul 29, 2021
2ffa5fa
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Jul 30, 2021
85438b2
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Aug 1, 2021
9d4bd08
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Aug 8, 2021
00c77e7
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Aug 11, 2021
0f59200
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Aug 19, 2021
9bcdbc5
Merge branch 'HDFGroup:hdf5_1_10' into hdf5_1_10
lrknox Aug 19, 2021
6caec86
CMake: (fix) ph5example test
Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions examples/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,14 @@ endif ()

### Windows pops up a modal permission dialog on this test
if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32)
# Ensure that 24 is a multiple of the number of processes.
# The number 24 corresponds to SPACE1_DIM1 and SPACE1_DIM2 defined in ph5example.c
math(EXPR NUMPROCS "24 / ((24 + ${MPIEXEC_MAX_NUMPROCS} - 1) / ${MPIEXEC_MAX_NUMPROCS})")
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
else ()
add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
-D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_OUTPUT=ph5example.out"
Expand Down