[svn-r20146] Description:

	Bring r19714:20145 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.6 (amazon) in debug mode
        Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

3 files changed, 17 insertions, 29 deletions

diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index a536c2e..df370bf 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -5,19 +5,11 @@ PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 # Setup include Directories
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
-LINK_DIRECTORIES (
-    ${CMAKE_Fortran_MODULE_DIRECTORY}
-    ${HDF5_F90_BINARY_DIR}
-    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-)
 
 #-----------------------------------------------------------------------------
 # Add Test Lib
 #-----------------------------------------------------------------------------
 ADD_LIBRARY (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c)
-# Must explicity add a dependency here to force the generation of headers
-# which are created for ${HDF5_F90_C_LIB_TARGET}
-#ADD_DEPENDENCIES(${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} )
 TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
     ${HDF5_TEST_LIB_TARGET}
@@ -25,11 +17,7 @@ TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET}
 H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
 
 ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90)
-# Must explicity add a dependency here to force the generation of headers
-# which are created for ${HDF5_F90_C_LIB_TARGET}
-ADD_DEPENDENCIES(${HDF5_F90_TEST_LIB_TARGET} 
-  ${HDF5_F90_C_TEST_LIB_TARGET}
-)
+SET (SHARED_LINK_FLAGS " ")
 IF (WIN32 AND NOT CYGWIN)
   IF (BUILD_SHARED_LIBS)
     SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
@@ -37,11 +25,7 @@ IF (WIN32 AND NOT CYGWIN)
 		    BUILD_HDF5_DLL
 	)
     IF (MSVC)
-      SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET}
-          PROPERTIES
-              COMPILE_FLAGS "/dll"
-              LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL"
-      )
+      SET (SHARED_LINK_FLAGS "/DLL")
     ENDIF (MSVC)
   ENDIF (BUILD_SHARED_LIBS)
   SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
@@ -49,6 +33,7 @@ IF (WIN32 AND NOT CYGWIN)
   	    HDF5F90_WINDOWS
   )
 ENDIF (WIN32 AND NOT CYGWIN)
+TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} ${SHARED_LINK_FLAGS})
 SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
 TARGET_LINK_LIBRARIES (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
@@ -74,8 +59,8 @@ ADD_EXECUTABLE (testhdf5_fortran
     tH5VL.f90
     tH5Z.f90
 )
-H5_NAMING (testhdf5_fortran)
-TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran)
+H5_NAMING (testhdf5_fortran ${LIB_TYPE})
+TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran "")
 TARGET_LINK_LIBRARIES (testhdf5_fortran 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -96,8 +81,8 @@ ADD_EXECUTABLE (testhdf5_fortran_1_8
     tH5A_1_8.f90
     tH5G_1_8.f90
 )
-H5_NAMING (testhdf5_fortran_1_8)
-TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran_1_8)
+H5_NAMING (testhdf5_fortran_1_8 ${LIB_TYPE})
+TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran_1_8 "")
 TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -112,8 +97,8 @@ ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
 
 #-- Adding test for fflush1
 ADD_EXECUTABLE (fflush1 fflush1.f90)
-H5_NAMING (fflush1)
-TARGET_FORTRAN_WIN_PROPERTIES (fflush1)
+H5_NAMING (fflush1 ${LIB_TYPE})
+TARGET_FORTRAN_WIN_PROPERTIES (fflush1 "")
 TARGET_LINK_LIBRARIES (fflush1 
     ${HDF5_F90_LIB_TARGET}
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -128,8 +113,8 @@ ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
 
 #-- Adding test for fflush2
 ADD_EXECUTABLE (fflush2 fflush2.f90)
-H5_NAMING (fflush2)
-TARGET_FORTRAN_WIN_PROPERTIES (fflush2)
+H5_NAMING (fflush2 ${LIB_TYPE})
+TARGET_FORTRAN_WIN_PROPERTIES (fflush2 "")
 TARGET_LINK_LIBRARIES (fflush2 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 4c0b03f..6fdfdf4 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -190,6 +190,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DIRECT_VFD = @DIRECT_VFD@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
@@ -251,6 +252,7 @@ LTLIBOBJS = @LTLIBOBJS@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MPE = @MPE@
 MPI_GET_SIZE = @MPI_GET_SIZE@
@@ -307,6 +309,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
index 223877c..c48420e 100644
--- a/fortran/test/tH5A_1_8.f90
+++ b/fortran/test/tH5A_1_8.f90
@@ -158,13 +158,13 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
 !!$              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 test_attr_info_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing querying attribute info by index', &
                 total_error)
 
            ret_total_error = 0
-           CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, ret_total_error)
+           CALL test_attr_delete_by_idx(new_format(i), my_fcpl, my_fapl, ret_total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing deleting attribute by index', &
                 total_error)
@@ -718,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, total_error)
+           CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error)
          !   CALL check("FAILED IN attr_info_by_idx_check",total_error)
         ENDDO