diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2022-10-19 13:55:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-19 13:55:06 (GMT) |
| commit | 889dc1e9a772ba3b13581677681533438451d958 (patch) | |
| tree | 5f0555a47f43ca24e29eee043ab042a5c083729b /fortran | |
| parent | 0fd867390a005f8857447dcfd47a989d1d86c371 (diff) | |
| download | hdf5-889dc1e9a772ba3b13581677681533438451d958.zip hdf5-889dc1e9a772ba3b13581677681533438451d958.tar.gz hdf5-889dc1e9a772ba3b13581677681533438451d958.tar.bz2 | |
address test failing when default real and integers are 8 bytes (#2173)
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/testpar/subfiling.F90 | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/fortran/testpar/subfiling.F90 b/fortran/testpar/subfiling.F90 index 330bab8..ac7f4d8 100644 --- a/fortran/testpar/subfiling.F90 +++ b/fortran/testpar/subfiling.F90 @@ -54,6 +54,8 @@ PROGRAM subfiling_test INTEGER(HID_T) :: driver_id + CHARACTER(len=8) :: hex1, hex2 + ! ! initialize MPI ! @@ -210,9 +212,12 @@ PROGRAM subfiling_test CALL h5pget_fapl_ioc_f(vfd_config%ioc_fapl_id, vfd_config_ioc, hdferror) CALL check("h5pget_fapl_ioc_f", hdferror, nerrors) - IF(vfd_config%magic .NE. H5FD_SUBFILING_FAPL_MAGIC_F .OR. & + WRITE(hex1,'(z8)') H5FD_SUBFILING_FAPL_MAGIC_F + WRITE(hex2,'(z8)') vfd_config%magic + + IF(hex1 .NE. hex2 .OR. & vfd_config%version .NE. H5FD_SUBFILING_CURR_FAPL_VERSION_F .OR. & - vfd_config%require_ioc .NEQV. .TRUE. .OR. & + .NOT.vfd_config%require_ioc .OR. & vfd_config%shared_cfg%ioc_selection .NE. SELECT_IOC_ONE_PER_NODE_F .OR. & vfd_config%shared_cfg%stripe_size .NE. H5FD_SUBFILING_DEFAULT_STRIPE_SIZE_F .OR. & vfd_config%shared_cfg%stripe_count .NE. H5FD_SUBFILING_DEFAULT_STRIPE_COUNT_F & @@ -225,8 +230,11 @@ PROGRAM subfiling_test IF(mpi_rank==0) CALL write_test_status(nerrors, & 'Testing H5Pset/get_fapl_subfiling_f with defaults', total_error) + WRITE(hex1,'(z8)') H5FD_IOC_FAPL_MAGIC_F + WRITE(hex2,'(z8)') vfd_config_ioc%magic + nerrors = 0 - IF(vfd_config_ioc%magic.NE. H5FD_IOC_FAPL_MAGIC_F .OR. & + IF(hex1 .NE. hex2 .OR. & vfd_config_ioc%version .NE. H5FD_IOC_CURR_FAPL_VERSION_F .OR. & vfd_config_ioc%thread_pool_size .NE. H5FD_IOC_DEFAULT_THREAD_POOL_SIZE_F & )THEN @@ -271,9 +279,12 @@ PROGRAM subfiling_test CALL h5pget_fapl_subfiling_f(fapl_id, vfd_config, hdferror) CALL check("h5pget_fapl_ioc_f", hdferror, nerrors) - IF(vfd_config%magic .NE. H5FD_SUBFILING_FAPL_MAGIC_F .OR. & + WRITE(hex1,'(z8)') H5FD_SUBFILING_FAPL_MAGIC_F + WRITE(hex2,'(z8)') vfd_config%magic + + IF(hex1 .NE. hex2 .OR. & vfd_config%version .NE. H5FD_SUBFILING_CURR_FAPL_VERSION_F .OR. & - vfd_config%require_ioc .NEQV. .TRUE. .OR. & + .NOT.vfd_config%require_ioc .OR. & vfd_config%shared_cfg%ioc_selection .NE. SELECT_IOC_ONE_PER_NODE_F .OR. & vfd_config%shared_cfg%stripe_size .NE. 16*1024*1024 .OR. & vfd_config%shared_cfg%stripe_count .NE. 3 & @@ -297,7 +308,7 @@ PROGRAM subfiling_test CALL h5pget_fapl_ioc_f(vfd_config%ioc_fapl_id, vfd_config_ioc, hdferror) CALL check("h5pget_fapl_ioc_f", hdferror, nerrors) - IF(vfd_config_ioc%magic .NE. H5FD_IOC_FAPL_MAGIC_F .OR. & + IF(& !vfd_config_ioc%magic .NE. H5FD_IOC_FAPL_MAGIC_F .OR. & vfd_config_ioc%version .NE. H5FD_IOC_CURR_FAPL_VERSION_F .OR. & vfd_config_ioc%thread_pool_size .NE. 2 & )THEN |