diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-27 15:39:54 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-27 15:39:54 (GMT) |
| commit | 54497d2b53c965aa995af37f89d24343af30a56f (patch) | |
| tree | efde294ce1689680fedcec806b8cb7ef7b2a8942 /testpar | |
| parent | f56008e0fe0c6bce99205911d05dd4396baf6952 (diff) | |
| parent | f56de2644447b080017866fb917a0f8363315a53 (diff) | |
| download | hdf5-54497d2b53c965aa995af37f89d24343af30a56f.zip hdf5-54497d2b53c965aa995af37f89d24343af30a56f.tar.gz hdf5-54497d2b53c965aa995af37f89d24343af30a56f.tar.bz2 | |
[svn-r27436] merge from trunk.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 8 | ||||
| -rw-r--r-- | testpar/t_file_image.c | 3 | ||||
| -rw-r--r-- | testpar/t_mpi.c | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 8bbc33c..8072215 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -4249,7 +4249,7 @@ setup_cache_for_test(hid_t * fid_ptr, if ( success ) { - if ( H5AC_set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) { + if ( H5AC__set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) { nerrors++; if ( verbose ) { @@ -4264,12 +4264,12 @@ setup_cache_for_test(hid_t * fid_ptr, if ( success ) { - if ( H5AC_set_sync_point_done_callback(cache_ptr, verify_writes) != SUCCEED ) { + if ( H5AC__set_sync_point_done_callback(cache_ptr, verify_writes) != SUCCEED ) { nerrors++; if ( verbose ) { HDfprintf(stdout, - "%d:%s: H5AC_set_sync_point_done_callback failed.\n", + "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank, FUNC); } } @@ -4997,7 +4997,7 @@ unlock_entry(H5F_t * file_ptr, nerrors++; if ( verbose ) { - HDfprintf(stdout, "%d:%s: error in H5C_unprotect().\n", + HDfprintf(stdout, "%d:%s: error in H5AC_unprotect().\n", world_mpi_rank, FUNC); } } else { diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c index 544ba32..a2246b6 100644 --- a/testpar/t_file_image.c +++ b/testpar/t_file_image.c @@ -241,6 +241,9 @@ file_image_daisy_chain_test(void) vector_ok = FALSE; VRFY((vector_ok), "verified received vector."); + HDfree(vector_ptr); + vector_ptr = NULL; + /* 7) closes the core file and exit. */ err = H5Sclose(space_id); diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 7bd2f58..873b952 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -281,7 +281,7 @@ test_mpio_gb_file(char *filename) printf("Skipped GB file range test " "because MPI_Offset cannot support it\n"); }else{ - buf = HDmalloc(MB); + buf = (char *)HDmalloc(MB); VRFY((buf!=NULL), "malloc succeed"); /* open a new file. Remove it first in case it exists. */ @@ -678,10 +678,9 @@ static int test_mpio_derived_dtype(char *filename) { int mpi_err_strlen; int mpi_err; int i; - int nerrors = 0; /* number of errors */ MPI_Datatype etype,filetype; MPI_Datatype adv_filetype,bas_filetype[2]; - MPI_Datatype etypenew, filetypenew; + MPI_Datatype filetypenew; MPI_Offset disp; MPI_Status Status; MPI_Aint adv_disp[2]; @@ -1100,7 +1099,7 @@ main(int argc, char **argv) * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0){ - printf("Failed to turn off atexit processing. Continue.\n", mpi_rank); + printf("Failed to turn off atexit processing. Continue.\n"); }; H5open(); if (parse_options(argc, argv) != 0){ |