diff options
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_bigio.c | 11 | ||||
| -rw-r--r-- | testpar/t_file.c | 16 | ||||
| -rw-r--r-- | testpar/t_shapesame.c | 3 |
3 files changed, 20 insertions, 10 deletions
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 4ecb09e..af65cda 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -26,7 +26,7 @@ const char *FILENAME[3] = {"bigio_test.h5", "single_rank_independent_io.h5", NUL #define DATASET4 "DSET4" #define DXFER_COLLECTIVE_IO 0x1 /* Collective IO*/ #define DXFER_INDEPENDENT_IO 0x2 /* Independent IO collectively */ -#define DXFER_BIGCOUNT (1 < 29) +#define DXFER_BIGCOUNT (1 << 29) #define HYPER 1 #define POINT 2 @@ -1165,9 +1165,16 @@ single_rank_independent_io(void) free(data); H5Sclose(fspace_id); - H5Pclose(fapl_id); H5Dclose(dset_id); H5Fclose(file_id); + + H5E_BEGIN_TRY + { + H5Fdelete(FILENAME[1], fapl_id); + } + H5E_END_TRY; + + H5Pclose(fapl_id); } MPI_Barrier(MPI_COMM_WORLD); } diff --git a/testpar/t_file.c b/testpar/t_file.c index 99ad13c..90ae22d 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -95,19 +95,21 @@ test_split_comm_access(void) fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, acc_tpl); VRFY((fid >= 0), "H5Fcreate succeeded"); - /* Release file-access template */ - ret = H5Pclose(acc_tpl); - VRFY((ret >= 0), ""); - /* close the file */ ret = H5Fclose(fid); VRFY((ret >= 0), ""); /* delete the test file */ - if (sub_mpi_rank == 0) { - mrc = MPI_File_delete(filename, info); - /*VRFY((mrc==MPI_SUCCESS), ""); */ + H5E_BEGIN_TRY + { + ret = H5Fdelete(filename, acc_tpl); } + H5E_END_TRY; + VRFY((ret >= 0), "H5Fdelete succeeded"); + + /* Release file-access template */ + ret = H5Pclose(acc_tpl); + VRFY((ret >= 0), ""); } mrc = MPI_Comm_free(&comm); VRFY((mrc == MPI_SUCCESS), "MPI_Comm_free succeeded"); diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index cbae5e1..c11f95c 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -4305,7 +4305,8 @@ main(int argc, char **argv) * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) { - HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank); + if (MAINPROCESS) + HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank); }; H5open(); h5_show_hostname(); |