summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-01-27 15:22:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-01-27 15:22:08 (GMT)
commite4055cbea65dcd37ccbc4ae66c91d45e1ce3bc3c (patch)
tree43e240cf4b7b1449e83c5eebad6f6e88909cc72b
parent0eec2cc20723a555f780815e0ea05038c51ad947 (diff)
parentb0aa2c037ebb742db520e4e9a72e06d21c4afa27 (diff)
downloadhdf5-e4055cbea65dcd37ccbc4ae66c91d45e1ce3bc3c.zip
hdf5-e4055cbea65dcd37ccbc4ae66c91d45e1ce3bc3c.tar.gz
hdf5-e4055cbea65dcd37ccbc4ae66c91d45e1ce3bc3c.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b0aa2c037ebb742db520e4e9a72e06d21c4afa27': 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)