diff options
| author | Richard Warren <Richard.Warren@hdfgroup.org> | 2017-10-18 11:21:33 (GMT) |
|---|---|---|
| committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2017-10-18 11:21:33 (GMT) |
| commit | 8a391887be263e0ba7f1ba659dcf6559b5a5e01a (patch) | |
| tree | 225ce5a9e02cdee24efe74d0d572d4e53645a0cc | |
| parent | 0c207cd2f84021526690bcbc4e0a8a49ea4cb8a4 (diff) | |
| parent | 9aada2bdb51f1c235e483f2bce109262bfbe22fa (diff) | |
| download | hdf5-8a391887be263e0ba7f1ba659dcf6559b5a5e01a.zip hdf5-8a391887be263e0ba7f1ba659dcf6559b5a5e01a.tar.gz hdf5-8a391887be263e0ba7f1ba659dcf6559b5a5e01a.tar.bz2 | |
Merge pull request #711 in HDFFV/hdf5 from optimize_superblock_read to develop
* commit '9aada2bdb51f1c235e483f2bce109262bfbe22fa':
in 'production' mode builds
Make fixes to avoid test failures in 'production' mode builds
| -rw-r--r-- | testpar/t_pread.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/testpar/t_pread.c b/testpar/t_pread.c index 7f23b9b..b5a84f2 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -99,11 +99,11 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id ) FILE *header = NULL; const char *fcn_name = "generate_test_file()"; const char *failure_mssg = NULL; - const char *group_filename = NULL; + char *group_filename = NULL; char data_filename[FILENAME_BUF_SIZE]; char reloc_data_filename[FILENAME_BUF_SIZE]; char prolog_filename[FILENAME_BUF_SIZE]; - int file_index; + int file_index = 0; int group_size; int group_rank; int local_failure = 0; @@ -162,7 +162,8 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id ) * is used to call into the h5_fixname function. No * need to worry that we reassign it for each file! */ - HDassert((group_filename = FILENAMES[file_index])); + group_filename = FILENAMES[file_index]; + HDassert( group_filename ); /* Assign the 'data_filename' */ if ( h5_fixname(group_filename, H5P_DEFAULT, data_filename, @@ -174,7 +175,8 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id ) if ( pass ) { - HDassert( (group_filename = FILENAMES[file_index+1]) ); + group_filename = FILENAMES[file_index+1]; + HDassert( group_filename ); /* Assign the 'reloc_data_filename' */ if ( h5_fixname(group_filename, H5P_DEFAULT, reloc_data_filename, @@ -186,8 +188,8 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id ) } if ( pass ) { - - HDassert( (group_filename = FILENAMES[file_index+2]) ); + group_filename = FILENAMES[file_index+2]; + HDassert( group_filename ); /* Assign the 'prolog_filename' */ if ( h5_fixname(group_filename, H5P_DEFAULT, prolog_filename, |