diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-12-30 16:43:17 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-12-30 16:43:17 (GMT) |
commit | 79e4e95e8276bf9295d709930c98e70e38907829 (patch) | |
tree | 150c0181c891c9bc2295c461626f5277a71445ee /fortran | |
parent | f4df3694542b626ede552fcaa09b10299224eaa5 (diff) | |
download | hdf5-79e4e95e8276bf9295d709930c98e70e38907829.zip hdf5-79e4e95e8276bf9295d709930c98e70e38907829.tar.gz hdf5-79e4e95e8276bf9295d709930c98e70e38907829.tar.bz2 |
[svn-r16232] Description:
Added chunk property to the data set because changes H5Dset_extent now require/check the the data set is chunked.
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/test/tH5A_1_8.f90 | 25 | ||||
-rw-r--r-- | fortran/test/tH5G_1_8.f90 | 5 |
2 files changed, 17 insertions, 13 deletions
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90 index c654d03..58408ee 100644 --- a/fortran/test/tH5A_1_8.f90 +++ b/fortran/test/tH5A_1_8.f90 @@ -118,11 +118,13 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) my_fcpl = fcpl END IF !!$ CALL test_attr_dense_create(my_fcpl, my_fapl) + ret_total_error = 0 CALL test_attr_dense_open(my_fcpl, my_fapl, ret_total_error) CALL write_test_status(ret_total_error, & ' - Testing INT attributes on both datasets and groups', & total_error) + !!$ CALL test_attr_dense_delete(my_fcpl, my_fapl) !!$ CALL test_attr_dense_rename(my_fcpl, my_fapl) !!$ CALL test_attr_dense_unlink(my_fcpl, my_fapl) @@ -155,7 +157,6 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) !!$ CALL test_attr_corder_create_reopen(my_fcpl, my_fapl) !!$ CALL test_attr_corder_transition(my_fcpl, my_fapl) !!$ CALL test_attr_corder_delete(my_fcpl, my_fapl) - ret_total_error = 0 CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, ret_total_error) CALL write_test_status(ret_total_error, & @@ -167,7 +168,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) CALL write_test_status(ret_total_error, & ' - Testing deleting attribute by index', & total_error) - + !!$ CALL test_attr_iterate2(new_format, my_fcpl, my_fapl) !!$ CALL test_attr_open_by_idx(new_format, my_fcpl, my_fapl) !!$ CALL test_attr_open_by_name(new_format, my_fcpl, my_fapl) @@ -201,13 +202,13 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) !!$ CALL test_attr_big(fcpl, my_fapl) !!$ CALL test_attr_null_space(fcpl, my_fapl) !!$ CALL test_attr_deprec(fcpl, my_fapl) -!!$ CALL test_attr_many(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_info_by_idx(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_delete_by_idx(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_iterate2(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_open_by_idx(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_open_by_name(new_format(i), fcpl, my_fapl) -!!$ CALL test_attr_create_by_name(new_format(i), fcpl, my_fapl) +!!$ CALL test_attr_many(new_format, fcpl, my_fapl) +!!$ CALL test_attr_info_by_idx(new_format, fcpl, my_fapl) +!!$ CALL test_attr_delete_by_idx(new_format, fcpl, my_fapl) +!!$ CALL test_attr_iterate2(new_format, fcpl, my_fapl) +!!$ CALL test_attr_open_by_idx(new_format, fcpl, my_fapl) +!!$ CALL test_attr_open_by_name(new_format, fcpl, my_fapl) +!!$ CALL test_attr_create_by_name(new_format, fcpl, my_fapl) !!$ CALL test_attr_bug1(fcpl, my_fapl) END IF @@ -717,7 +718,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error) CALL check("h5aclose_f",error,total_error) ! /* Verify information for NEW attribute */ - CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error) + CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index, total_error) ! CALL check("FAILED IN attr_info_by_idx_check",total_error) ENDDO @@ -777,7 +778,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error) !!$ } /* end if */ !!$ !!$ /* Verify information for new attribute */ -!!$ ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index(i)); +!!$ ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index); !!$ CHECK(ret, FAIL, "attr_info_by_idx_check"); ENDDO @@ -794,7 +795,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error) !!$ /* Retrieve & verify # of records in the name & creation order indices */ !!$ ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count); !!$ CHECK(ret, FAIL, "H5O_attr_dense_info_test"); -!!$ if(use_index(i)) +!!$ if(use_index) !!$ VERIFY(name_count, corder_count, "H5O_attr_dense_info_test"); !!$ VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test"); !!$ } /* end if */ diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90 index 0caec01..443b0e8 100644 --- a/fortran/test/tH5G_1_8.f90 +++ b/fortran/test/tH5G_1_8.f90 @@ -1485,6 +1485,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, & INTEGER :: i INTEGER :: tmp1, tmp2 + INTEGER(HID_T) :: crp_list ! WRITE(*,*) "link creation property lists (w/new group format)" @@ -1541,9 +1542,11 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, & !/* Create a dataspace */ CALL h5screate_simple_f(2, dims, space_id, error) CALL check("test_lcpl.h5screate_simple_f",error,total_error) + CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error) + CALL h5pset_chunk_f(crp_list, 2, dims, error) ! /* Create a dataset using the default LCPL */ - CALL h5dcreate_f(file_id, "/dataset", H5T_NATIVE_INTEGER, space_id, dset_id, error) + CALL h5dcreate_f(file_id, "/dataset", H5T_NATIVE_INTEGER, space_id, dset_id, error, crp_list) CALL check("test_lcpl.h5dcreate_f", error, total_error) CALL h5dclose_f(dset_id, error) CALL check("test_lcpl.h5dclose_f", error, total_error) |