Merge pull request #240 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop

* commit 'a5c15d7b59fd0c8b39a3c1d311d2c7a9e55ff441':
  Enabled commented out code,     HDFFV-9498 -- PGI COMPILER BUG: READ(...,pos,) fails for pgf90 causes offset test to fail

1 files changed, 42 insertions, 45 deletions

diff --git a/fortran/test/fortranlib_test.F90 b/fortran/test/fortranlib_test.F90
index 2f88c45..bcf5693 100644
--- a/fortran/test/fortranlib_test.F90
+++ b/fortran/test/fortranlib_test.F90
@@ -62,10 +62,10 @@ PROGRAM fortranlibtest
   ENDIF
   WRITE(*,*)
 
-!     CALL h5check_version_f(1,4,4,total_error)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing FILE Interface                   '
-!     write(*,*) '========================================='
+!      CALL h5check_version_f(1,4,4,total_error)
+!      '========================================='
+!      'Testing FILE Interface                   '
+!      '========================================='
 
   ret_total_error = 0
   CALL mountingtest(cleanup, ret_total_error)
@@ -83,10 +83,10 @@ PROGRAM fortranlibtest
   CALL file_space("file_space",cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' File free space test', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATASET Interface                '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing DATASET Interface                '
+!      '========================================='
 
   ret_total_error = 0
   CALL datasettest(cleanup, ret_total_error)
@@ -96,25 +96,22 @@ PROGRAM fortranlibtest
   CALL extenddsettest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Extendible dataset test', total_error)
 
-! -- DISABLE TEST FOR PGI COMPILER DUE TO COMPILER BUG -- 8/2015 -- HDFFV-9498
-!#if H5_Fortran_COMPILER_ID!=PGI
-!  CALL test_userblock_offset(cleanup, ret_total_error)
-!  CALL write_test_status(ret_total_error, ' Dataset offset with user block', total_error)
-!#endif
+  CALL test_userblock_offset(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Dataset offset with user block', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATASPACE Interface             '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing DATASPACE Interface             '
+!      '========================================='
 
   ret_total_error = 0
   CALL dataspace_basic_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Basic dataspace test', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing REFERENCE Interface              '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing REFERENCE Interface              '
+!      '========================================='
 
   ret_total_error = 0
   CALL refobjtest(cleanup, ret_total_error)
@@ -124,10 +121,10 @@ PROGRAM fortranlibtest
   CALL refregtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Reference to dataset region test', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing selection functionalities        '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing selection functionalities        '
+!      '========================================='
 
   ret_total_error = 0
   CALL test_basic_select(cleanup, ret_total_error)
@@ -154,10 +151,10 @@ PROGRAM fortranlibtest
   CALL test_select_bounds(ret_total_error)
   CALL write_test_status(ret_total_error, ' Selection bounds test ', total_error)
   
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing DATATYPE interface               '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing DATATYPE interface               '
+!      '========================================='
   ret_total_error = 0
   CALL basic_data_type_test(ret_total_error)
   CALL write_test_status(ret_total_error, ' Basic datatype test', total_error)
@@ -174,10 +171,10 @@ PROGRAM fortranlibtest
   CALL test_derived_flt(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Derived float datatype test', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing PROPERTY interface               '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing PROPERTY interface               '
+!      '========================================='
 
   ret_total_error = 0
   CALL external_test(cleanup, ret_total_error)
@@ -191,19 +188,19 @@ PROGRAM fortranlibtest
   CALL test_chunk_cache (cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing ATTRIBUTE interface              '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing ATTRIBUTE interface              '
+!      '========================================='
 
   ret_total_error = 0
   CALL attribute_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Attribute test', total_error)
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing IDENTIFIER interface             '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing IDENTIFIER interface             '
+!      '========================================='
 
   ret_total_error = 0
   CALL identifier_test(cleanup, ret_total_error)
@@ -222,10 +219,10 @@ PROGRAM fortranlibtest
      CALL write_test_status(ret_total_error, ' SZIP filter test', total_error)
   ENDIF
 
-!     write(*,*)
-!     write(*,*) '========================================='
-!     write(*,*) 'Testing GROUP interface             '
-!     write(*,*) '========================================='
+!     
+!      '========================================='
+!      'Testing GROUP interface                  '
+!      '========================================='
 
   ret_total_error = 0
   CALL group_test(cleanup, ret_total_error)