From 39e47fe74d4991ea478ab579387c1860c4f503f1 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Fri, 3 Nov 2000 14:48:15 -0500 Subject: [svn-r2796] Purpose: Maintenance Description: Updated tests to use new F90 programming model. Platforms tested: O2K and Solaris2.7 --- fortran/test/fflush1.f90 | 2 +- fortran/test/fflush2.f90 | 4 ++-- fortran/test/fortranlib_test.f90 | 35 ++++++++++++++++++----------------- fortran/test/tH5T.f90 | 8 ++++---- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90 index 8aee1b6..c76a55b 100644 --- a/fortran/test/fflush1.f90 +++ b/fortran/test/fflush1.f90 @@ -71,7 +71,7 @@ ! !Initialize FORTRAN predifined datatypes ! - CALL h5init_types_f(error) + CALL h5init_fortran_f(error) CALL check("h5init_types_f",error,total_error) ! diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90 index a0a076f..63f83a8 100644 --- a/fortran/test/fflush2.f90 +++ b/fortran/test/fflush2.f90 @@ -71,7 +71,7 @@ ! !Initialize FORTRAN predifined datatypes ! - CALL h5init_types_f(error) + CALL h5init_fortran_f(error) CALL check("h5init_types_f",error,total_error) ! @@ -152,7 +152,7 @@ ! !Close FORTRAN predifined datatypes ! - CALL h5close_types_f(error) + CALL h5close_fortran_f(error) CALL check("h5close_types_f",error,total_error) END PROGRAM FFLUSH2EXAMPLE diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90 index 7e57b21..39642dc 100644 --- a/fortran/test/fortranlib_test.f90 +++ b/fortran/test/fortranlib_test.f90 @@ -29,7 +29,7 @@ CHARACTER*8 :: failure = '*FAILED*' CHARACTER*4 :: e_format ='(8a)' - CALL h5init_types_f(error) + CALL h5init_fortran_f(error) write(*,*) ' ========================== ' write(*,*) ' FORTRAN tests ' write(*,*) ' ========================== ' @@ -41,7 +41,8 @@ CALL mountingtest(mounting_total_error) IF (mounting_total_error == 0) error_string = success write(*, fmt = '(14a)', advance = 'no') ' Mounting test' - write(*, fmt = '(57x)', advance = 'no') + write(*, fmt = '(56x,a)', advance = 'no') ' ' + write(*, fmt = e_format) error_string total_error = total_error + mounting_total_error @@ -49,7 +50,7 @@ CALL reopentest(reopen_total_error) IF (reopen_total_error == 0) error_string = success write(*, fmt = '(12a)', advance = 'no') ' Reopen test' - write(*, fmt = '(59x)', advance = 'no') + write(*, fmt = '(58x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + reopen_total_error @@ -63,7 +64,7 @@ CALL datasettest(dataset_total_error) IF (dataset_total_error == 0) error_string = success write(*, fmt = '(13a)', advance = 'no') ' Dataset test' - write(*, fmt = '(58x)', advance = 'no') + write(*, fmt = '(57x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + dataset_total_error @@ -71,7 +72,7 @@ CALL extenddsettest(extend_dataset_total_error) IF (extend_dataset_total_error == 0) error_string = success write(*, fmt = '(24a)', advance = 'no') ' Extendible dataset test' - write(*, fmt = '(47x)', advance = 'no') + write(*, fmt = '(46x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + extend_dataset_total_error @@ -84,7 +85,7 @@ CALL dataspace_basic_test(dataspace_total_error) IF (dataspace_total_error == 0) error_string = success write(*, fmt = '(21a)', advance = 'no') ' Basic dataspace test' - write(*, fmt = '(50x)', advance = 'no') + write(*, fmt = '(49x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + dataspace_total_error @@ -98,7 +99,7 @@ CALL refobjtest(refobj_total_error) IF (refobj_total_error == 0) error_string = success write(*, fmt = '(25a)', advance = 'no') ' Reference to object test' - write(*, fmt = '(46x)', advance = 'no') + write(*, fmt = '(45x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + refobj_total_error @@ -106,7 +107,7 @@ CALL refregtest(refreg_total_error) IF (refreg_total_error == 0) error_string = success write(*, fmt = '(33a)', advance = 'no') ' Reference to dataset region test' - write(*, fmt = '(38x)', advance = 'no') + write(*, fmt = '(37x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + refreg_total_error @@ -119,7 +120,7 @@ CALL test_basic_select(basic_select_total_error) IF (basic_select_total_error == 0) error_string = success write(*, fmt = '(21a)', advance = 'no') ' Basic selection test' - write(*, fmt = '(50x)', advance = 'no') + write(*, fmt = '(49x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + basic_select_total_error @@ -127,7 +128,7 @@ CALL test_select_hyperslab( hyperslab_total_error) IF ( hyperslab_total_error == 0) error_string = success write(*, fmt = '(25a)', advance = 'no') ' Hyperslab selection test' - write(*, fmt = '(46x)', advance = 'no') + write(*, fmt = '(45x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + hyperslab_total_error @@ -135,7 +136,7 @@ CALL test_select_element(element_total_error) IF (element_total_error == 0) error_string = success write(*, fmt = '(23a)', advance = 'no') ' Element selection test' - write(*, fmt = '(48x)', advance = 'no') + write(*, fmt = '(47x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + element_total_error @@ -149,7 +150,7 @@ CALL basic_data_type_test(basic_datatype_total_error) IF (basic_datatype_total_error == 0) error_string = success write(*, fmt = '(20a)', advance = 'no') ' Basic datatype test' - write(*, fmt = '(51x)', advance = 'no') + write(*, fmt = '(50x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + basic_datatype_total_error @@ -157,7 +158,7 @@ CALL compoundtest(total_error_compoundtest) IF (total_error_compoundtest == 0) error_string = success write(*, fmt = '(23a)', advance = 'no') ' Compound datatype test' - write(*, fmt = '(48x)', advance = 'no') + write(*, fmt = '(47x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + total_error_compoundtest @@ -170,7 +171,7 @@ CALL external_test(external_total_error) IF (external_total_error == 0) error_string = success write(*, fmt = '(22a)', advance = 'no') ' External dataset test' - write(*, fmt = '(49x)', advance = 'no') + write(*, fmt = '(48x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + external_total_error @@ -182,7 +183,7 @@ error_string = failure CALL attribute_test(attribute_total_error) write(*, fmt = '(15a)', advance = 'no') ' Attribute test' - write(*, fmt = '(56x)', advance = 'no') + write(*, fmt = '(55x,a)', advance = 'no') ' ' IF (attribute_total_error == 0) error_string = success write(*, fmt = e_format) error_string total_error = total_error + attribute_total_error @@ -196,7 +197,7 @@ CALL identifier_test(identifier_total_error) IF (identifier_total_error == 0) error_string = success write(*, fmt = '(16a)', advance = 'no') ' Identifier test' - write(*, fmt = '(55x)', advance = 'no') + write(*, fmt = '(54x,a)', advance = 'no') ' ' write(*, fmt = e_format) error_string total_error = total_error + identifier_total_error @@ -208,7 +209,7 @@ write(*, fmt = '(12a)' ) ' error(s) ! ' write(*,*) ' ============================================ ' - CALL h5close_types_f(error) + CALL h5close_fortran_f(error) END PROGRAM fortranlibtest diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90 index 2b6301b..ca2f4ab 100644 --- a/fortran/test/tH5T.f90 +++ b/fortran/test/tH5T.f90 @@ -655,20 +655,20 @@ write (*,*) "got cset is not correct" total_error = total_error + 1 end if - CALL h5tset_strpad_f(dtype5_id, H5T_STR_NULL_F, error) + CALL h5tset_strpad_f(dtype5_id, H5T_STR_NULLPAD_F, error) CALL check("h5tset_strpad_f",error,total_error) CALL h5tget_strpad_f(dtype5_id, strpad, error) CALL check("h5tget_strpad_f",error,total_error) - if(strpad .ne. H5T_STR_NULL_F ) then + if(strpad .ne. H5T_STR_NULLPAD_F ) then write (*,*) "got strpad is not correct" total_error = total_error + 1 end if - CALL h5tset_strpad_f(dtype5_id, H5T_STR_SPACE_F, error) + CALL h5tset_strpad_f(dtype5_id, H5T_STR_SPACEPAD_F, error) CALL check("h5tset_strpad_f",error,total_error) CALL h5tget_strpad_f(dtype5_id, strpad, error) CALL check("h5tget_strpad_f",error,total_error) - if(strpad .ne. H5T_STR_SPACE_F ) then + if(strpad .ne. H5T_STR_SPACEPAD_F ) then write (*,*) "got strpad is not correct" total_error = total_error + 1 end if -- cgit v0.12