summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-01-27 15:18:53 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-02-01 05:03:35 (GMT)
commit4475757f93a29ff5209f8ec3187f6ecbf1a67a08 (patch)
tree19f0edf6727a5805acd6c08979d62affd67dd3b1
parent561a0c8ff556f7b3cee58eb867ae1aa74edc61a2 (diff)
downloadhdf5-4475757f93a29ff5209f8ec3187f6ecbf1a67a08.zip
hdf5-4475757f93a29ff5209f8ec3187f6ecbf1a67a08.tar.gz
hdf5-4475757f93a29ff5209f8ec3187f6ecbf1a67a08.tar.bz2
Merge pull request #2312 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '1c812fcd5d475afb7e65ed28d84990f96eefa649': Restore fix of test assert fail eror undone by later commit.
-rw-r--r--testpar/t_mpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 2dbb4d2..670e02b 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -351,7 +351,7 @@ static int test_mpio_gb_file(char *filename) {
mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE,
&mpi_stat);
INFO((mrc == MPI_SUCCESS), "GB size file read");
- H5_CHECKED_ASSIGN(expected, int8_t, i * mpi_size + (mpi_size - mpi_rank - 1), int);
+ expected = (int8_t)(i * mpi_size + (mpi_size - mpi_rank - 1));
vrfyerrs = 0;
for (j = 0; j < MB; j++) {
if ((*(buf + j) != expected)