philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1261 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'a2da9930af38a86387466a2021b71a2cc7484f1b':
  replace page chars
  Remove obsolete comment
This commit is contained in:
Allen Byrne
2018-09-27 13:41:31 -05:00
parent cc8538e1ed a2da9930af
commit 40179a9496
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
testpar/t_pread.c
View File

@@ -104,7 +104,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
hid_t file_id = -1;
hid_t memspace = -1;
hid_t filespace = -1;
hid_t fctmpl = -1;
hid_t fctmpl = -1;
hid_t fapl_id = -1;
hid_t dxpl_id = -1;
hid_t dset_id = -1;
@@ -180,17 +180,17 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
}
}
/* Initialize a file creation template */
if (pass) {
if ((fctmpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
pass = FALSE;
failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
}
else if (H5Pset_userblock(fctmpl, 512) != SUCCEED) {
pass = FALSE;
failure_mssg = "H5Pset_userblock(,size) failed.\n";
}
}
/* Initialize a file creation template */
if (pass) {
if ((fctmpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
pass = FALSE;
failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
}
else if (H5Pset_userblock(fctmpl, 512) != SUCCEED) {
pass = FALSE;
failure_mssg = "H5Pset_userblock(,size) failed.\n";
}
}
/* setup FAPL */
if ( pass ) {
if ( (fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0 ) {
@@ -347,7 +347,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
bytes_to_write = HDstrlen(text_to_write);
if (pass) {
if ((header = HDopen(data_filename, O_WRONLY)) < 0) {
if ((header = HDopen(data_filename, O_WRONLY)) < 0) {
pass = FALSE;
failure_mssg = "HDopen(data_filename, O_WRONLY) failed.\n";
}
@@ -358,7 +358,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
if (HDwrite(header, text_to_write, bytes_to_write) < 0) {
pass = FALSE;
failure_mssg = "Unable to write user text into file.\n";
}
}
}
if (pass || (header > 0)) {
@@ -699,18 +699,11 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, 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:
*
*-------------------------------------------------------------------------
*/