[svn-r20383] Description:

    Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

4 files changed, 14 insertions, 7 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index b1a9b90..ee459e1 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -32,7 +32,7 @@ SET (examples
 
 FOREACH (example ${examples})
   ADD_EXECUTABLE (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  H5_NAMING (f90_ex_${example} ${LIB_TYPE})
+  TARGET_NAMING (f90_ex_${example} ${LIB_TYPE})
   TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_${example} "")
   IF (WIN32 AND NOT CYGWIN)
     SET_PROPERTY (TARGET f90_ex_${example} 
@@ -54,7 +54,7 @@ ENDFOREACH (example ${examples})
 
 IF (H5_HAVE_PARALLEL)
   ADD_EXECUTABLE (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  H5_NAMING (f90_ex_ph5example ${LIB_TYPE})
+  TARGET_NAMING (f90_ex_ph5example ${LIB_TYPE})
   TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_ph5example "")
   IF (WIN32 AND NOT CYGWIN)
     SET_PROPERTY (TARGET f90_ex_ph5example 
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index df370bf..eab7180 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -59,7 +59,7 @@ ADD_EXECUTABLE (testhdf5_fortran
     tH5VL.f90
     tH5Z.f90
 )
-H5_NAMING (testhdf5_fortran ${LIB_TYPE})
+TARGET_NAMING (testhdf5_fortran ${LIB_TYPE})
 TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran "")
 TARGET_LINK_LIBRARIES (testhdf5_fortran 
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -81,7 +81,7 @@ ADD_EXECUTABLE (testhdf5_fortran_1_8
     tH5A_1_8.f90
     tH5G_1_8.f90
 )
-H5_NAMING (testhdf5_fortran_1_8 ${LIB_TYPE})
+TARGET_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}
@@ -97,7 +97,7 @@ 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 ${LIB_TYPE})
+TARGET_NAMING (fflush1 ${LIB_TYPE})
 TARGET_FORTRAN_WIN_PROPERTIES (fflush1 "")
 TARGET_LINK_LIBRARIES (fflush1 
     ${HDF5_F90_LIB_TARGET}
@@ -113,7 +113,7 @@ ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
 
 #-- Adding test for fflush2
 ADD_EXECUTABLE (fflush2 fflush2.f90)
-H5_NAMING (fflush2 ${LIB_TYPE})
+TARGET_NAMING (fflush2 ${LIB_TYPE})
 TARGET_FORTRAN_WIN_PROPERTIES (fflush2 "")
 TARGET_LINK_LIBRARIES (fflush2 
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -126,3 +126,4 @@ ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (fflush2 PROPERTIES LINKER_LANGUAGE Fortran)
 
 ADD_TEST (NAME fflush2 COMMAND $<TARGET_FILE:fflush2>)
+SET_TESTS_PROPERTIES(fflush2 PROPERTIES DEPENDS fflush1)
diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90
index d8acc29..08580c8 100644
--- a/fortran/test/fortranlib_test.f90
+++ b/fortran/test/fortranlib_test.f90
@@ -172,10 +172,16 @@ PROGRAM fortranlibtest
   CALL external_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' External dataset test', total_error)
 
+!DEC$ if defined(H5_VMS)
+  GOTO 9
+!DEC$ else
   ret_total_error = 0
   CALL multi_file_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
+!DEC$ endif
+9 CONTINUE
 
+  ret_total_error = 0
   CALL test_chunk_cache (cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
 
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index c94640a..c71f679 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -16,7 +16,7 @@ ADD_EXECUTABLE (parallel_test
     hyper.f90
     mdset.f90
 )
-H5_NAMING (parallel_test ${LIB_TYPE})
+TARGET_NAMING (parallel_test ${LIB_TYPE})
 TARGET_FORTRAN_WIN_PROPERTIES (parallel_test "")
 TARGET_LINK_LIBRARIES (parallel_test 
     ${HDF5_F90_TEST_LIB_TARGET}