diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-02-08 17:09:27 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-02-08 17:09:27 (GMT) |
| commit | 9fbb672eb4d926539010d4216886cfc640af6fa9 (patch) | |
| tree | 0add7e2c3ec422f1241beedabae5155b9b8efa2a /test | |
| parent | 5258d42aa6fe12918196864054067b36b7fe978c (diff) | |
| parent | bb354058c00e276aece09ec13431d7ae2c5ff041 (diff) | |
| download | hdf5-9fbb672eb4d926539010d4216886cfc640af6fa9.zip hdf5-9fbb672eb4d926539010d4216886cfc640af6fa9.tar.gz hdf5-9fbb672eb4d926539010d4216886cfc640af6fa9.tar.bz2 | |
Merge pull request #291 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'bb354058c00e276aece09ec13431d7ae2c5ff041':
Added #ifdef QAK macros around log VFD calls in SWMR acceptance tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/swmr_reader.c | 3 | ||||
| -rw-r--r-- | test/swmr_start_write.c | 2 | ||||
| -rw-r--r-- | test/swmr_writer.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/test/swmr_reader.c b/test/swmr_reader.c index af4a450..0af0ece 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -278,6 +278,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, if((fapl = h5_fileaccess()) < 0) return -1; +#ifdef QAK /* Log I/O when verbose output it enbabled */ if(verbose) { char verbose_name[1024]; @@ -286,7 +287,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, H5Pset_fapl_log(fapl, verbose_name, H5FD_LOG_ALL, (size_t)(512 * 1024 * 1024)); } /* end if */ - +#endif /* QAK */ /* Loop over reading records until [at least] the correct # of seconds have passed */ while(curr_time < (time_t)(start_time + (time_t)nseconds)) { diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index 26a3dab..ab639fb 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -92,6 +92,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) return -1; +#ifdef QAK if(verbose) { char verbose_name[1024]; @@ -99,6 +100,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, H5Pset_fapl_log(fapl, verbose_name, H5FD_LOG_ALL, (size_t)(512 * 1024 * 1024)); } /* end if */ +#endif /* QAK */ /* Create file creation property list */ if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) diff --git a/test/swmr_writer.c b/test/swmr_writer.c index 4700e2f..3c2e8c6 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -107,6 +107,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, } #endif /* QAK */ +#ifdef QAK if(verbose) { char verbose_name[1024]; @@ -114,6 +115,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, H5Pset_fapl_log(fapl, verbose_name, H5FD_LOG_ALL, (size_t)(512 * 1024 * 1024)); } /* end if */ +#endif /* QAK */ /* Open the file */ if((fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0) |