diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-30 21:58:24 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-30 21:58:24 (GMT) |
commit | a873d149e535a32cc1125fb744b0344112096d48 (patch) | |
tree | 4cf3224af16a9e1953c439ff6880a6b3076eb0c8 /testpar | |
parent | 1b2941af4351b39f915efd158fdfdda2e70ba589 (diff) | |
download | hdf5-a873d149e535a32cc1125fb744b0344112096d48.zip hdf5-a873d149e535a32cc1125fb744b0344112096d48.tar.gz hdf5-a873d149e535a32cc1125fb744b0344112096d48.tar.bz2 |
Cleanup when merging to other branches
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/t_cache.c | 4 | ||||
-rw-r--r-- | testpar/t_filters_parallel.c | 5 | ||||
-rw-r--r-- | testpar/t_pread.c | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 29c6f4a..3004f9f 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -1228,7 +1228,7 @@ setup_derived_types(void) nerrors++; success = FALSE; if ( verbose ) { - HDfprintf(stdout, "%d:%s: MPI_Get_Address() call failed.\n", + HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", world_mpi_rank, FUNC); } @@ -1250,7 +1250,7 @@ setup_derived_types(void) nerrors++; success = FALSE; if ( verbose ) { - HDfprintf(stdout, "%d:%s: MPI_Type_struct() call failed.\n", + HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", world_mpi_rank, FUNC); } } diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 1f26e0d..db5bd13 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -3683,6 +3683,8 @@ test_read_filtered_dataset_point_selection(void) if (read_buf) HDfree(read_buf); if (correct_buf) HDfree(correct_buf); + HDfree(coords); + VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Sclose(filespace) >= 0), "File dataspace close succeeded"); VRFY((H5Sclose(memspace) >= 0), "Memory dataspace close succeeded"); @@ -5791,6 +5793,9 @@ test_write_parallel_read_serial(void) VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); + + HDfree(correct_buf); + HDfree(read_buf); } return; diff --git a/testpar/t_pread.c b/testpar/t_pread.c index ac33b88..74feeb6 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -1079,18 +1079,11 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * with the opening and validation of the data contained * therein. * - * WARNING: This test uses fork() and execve(), and - * therefore will not run on Windows. - * * Return: Success: 0 - * * Failure: 1 * * Programmer: Richard Warren * 10/1/17 - * - * Modifications: - * *------------------------------------------------------------------------- */ |