From 31b3c349083232358eb5b0ae4c0ee7c1f1dae4af Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Sun, 4 May 2008 00:24:04 -0500 Subject: [svn-r14927] Maintenance: Enabled all tests that pass on linew. Disabled tests are commented with !!EP for now. --- fortran/test/fortranlib_test_1_8.f90 | 28 ++++++++++++++-------------- fortran/test/tH5A_1_8.f90 | 8 ++++---- fortran/test/tH5G_1_8.f90 | 3 ++- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90 index 34c5b90..acfd1af 100644 --- a/fortran/test/fortranlib_test_1_8.f90 +++ b/fortran/test/fortranlib_test_1_8.f90 @@ -81,20 +81,20 @@ PROGRAM fortranlibtest ! write(*,*) 'Testing ATTRIBUTE interface ' ! write(*,*) '=========================================' -! error_string = failure -! CALL attribute_test_1_8(cleanup, attribute_total_error) -! WRITE(*, fmt = '(15a)', advance = 'no') ' ATTRIBUTE TEST' -! 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 - -! CALL group_test(cleanup, group_total_error) -! WRITE(*, fmt = '(15a)', advance = 'no') ' GROUP TEST' -! WRITE(*, fmt = '(55x,a)', advance = 'no') ' ' -! IF (group_total_error == 0) error_string = success -! WRITE(*, fmt = e_format) error_string -! total_error = total_error + group_total_error + error_string = failure + CALL attribute_test_1_8(cleanup, attribute_total_error) + WRITE(*, fmt = '(15a)', advance = 'no') ' Testing attributes' + WRITE(*, fmt = '(57x,a)', advance = 'no') ' ' + IF (attribute_total_error == 0) error_string = success + WRITE(*, fmt = e_format) error_string + total_error = total_error + attribute_total_error + + CALL group_test(cleanup, group_total_error) + WRITE(*, fmt = '(15a)', advance = 'no') ' Testing groups' + WRITE(*, fmt = '(61x,a)', advance = 'no') ' ' + IF (group_total_error == 0) error_string = success + WRITE(*, fmt = e_format) error_string + total_error = total_error + group_total_error CALL test_h5o(cleanup, group_total_error ) WRITE(*, fmt = '(15a)', advance = 'no') ' Testing object interface' diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90 index 8a5f99a..9f0296d 100644 --- a/fortran/test/tH5A_1_8.f90 +++ b/fortran/test/tH5A_1_8.f90 @@ -111,7 +111,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) my_fcpl = fcpl END IF !!$ CALL test_attr_dense_create(my_fcpl, my_fapl) - CALL test_attr_dense_open(my_fcpl, my_fapl, total_error) +!!EP CALL test_attr_dense_open(my_fcpl, my_fapl, 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) @@ -126,12 +126,12 @@ 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) - CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, total_error) - CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, total_error) +!!EP CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, total_error) +!!EP CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, 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) - CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, total_error) +!!EP CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, total_error) ! /* More complex tests with both "new format" and "shared" attributes */ IF( use_shared(j) ) THEN !!$ CALL test_attr_shared_write(my_fcpl, my_fapl) diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90 index 6eee5c2..a1111cd 100644 --- a/fortran/test/tH5G_1_8.f90 +++ b/fortran/test/tH5G_1_8.f90 @@ -24,6 +24,7 @@ SUBROUTINE group_test(cleanup, total_error) INTEGER :: error + WRITE(*,*) "TESTING GROUPS" CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error) CALL check("H5Pcreate_f",error, total_error) @@ -46,7 +47,7 @@ SUBROUTINE group_test(cleanup, total_error) ! CALL ud_hard_links(fapl2,total_error) CALL timestamps(cleanup, fapl2, total_error) CALL test_move_preserves(fapl2, total_error) - CALL delete_by_idx(cleanup,fapl2, total_error) +!EP CALL delete_by_idx(cleanup,fapl2, total_error) CALL test_lcpl(cleanup, fapl, total_error) CALL objcopy(fapl, total_error) -- cgit v0.12