summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-02-02 05:34:52 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-02-02 05:34:52 (GMT)
commitc911a3161e965a13d248944ef72808780222f7ce (patch)
treef87d52969731787a28224be60174c2c95867b1b6
parent2a43381cd3b96cd92f55b43ffe92bf6f02a4dc00 (diff)
parent51e51bc4b4a1acc58501b4a108a584c25e6c9b61 (diff)
downloadhdf5-c911a3161e965a13d248944ef72808780222f7ce.zip
hdf5-c911a3161e965a13d248944ef72808780222f7ce.tar.gz
hdf5-c911a3161e965a13d248944ef72808780222f7ce.tar.bz2
Merge pull request #2340 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_12_0 to hdf5_1_12_0
* commit '51e51bc4b4a1acc58501b4a108a584c25e6c9b61': 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)