diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 73cf14587dc..4a84b914ddf 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -322,12 +322,14 @@ if (H5EX_BUILD_TESTING) endmacro () macro (ADD_H5_CMP_TEST testname) + MESSAGE(status "LDKJFLDKJF ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall COMMAND ${CMAKE_COMMAND} -E remove ${testname}.out.tmp ) + MESSAGE(status "HERE ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname} COMMAND "${CMAKE_COMMAND}" @@ -348,9 +350,9 @@ if (H5EX_BUILD_TESTING) ADD_H5_CMP_TEST (h5ex_g_corder) ADD_H5_CMP_TEST (h5ex_g_phase) # if (HDF_ENABLE_F2003) - ADD_H5_CMP_TEST (h5ex_g_intermediate) - ADD_H5_CMP_TEST (h5ex_g_iterate) - ADD_H5_CMP_TEST (h5ex_g_traverse) +# ADD_H5_CMP_TEST (h5ex_g_intermediate) +# ADD_H5_CMP_TEST (h5ex_g_iterate) +# ADD_H5_CMP_TEST (h5ex_g_traverse) ADD_H5_CMP_TEST (h5ex_g_visit) # endif () diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index fa38fe6d36d..272e5988946 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -8,6 +8,7 @@ set (common_examples h5ex_g_corder h5ex_g_phase h5ex_g_create + h5ex_g_visit_F03 ) #set (f03_examples diff --git a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt index 792caaf0bf6..80db7d6e8e4 100644 --- a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt @@ -66,11 +66,10 @@ if (H5EX_BUILD_TESTING) # Ensure that 24 is a multiple of the number of processes. # The number 24 corresponds to SPACE1_DIM1 and SPACE1_DIM2 defined in ph5example.c math(EXPR NUMPROCS "24 / ((24 + ${MPIEXEC_MAX_NUMPROCS} - 1) / ${MPIEXEC_MAX_NUMPROCS})") - foreach (example_name ${examples}) - if (${example_name} STREQUAL "ph5_hyperslab_by_col") + if (${example_name} STREQUAL "ph5_f90_hyperslab_by_row") ADD_GREP_TEST (${example_name} 2) - elseif (${example_name} STREQUAL "ph5_hyperslab_by_chunk" OR ${example_name} STREQUAL "ph5_hyperslab_by_pattern") + elseif (${example_name} STREQUAL "ph5_f90_hyperslab_by_chunk" OR ${example_name} STREQUAL "ph5_f90_hyperslab_by_pattern") ADD_GREP_TEST (${example_name} 4) else () ADD_GREP_TEST (${example_name} ${NUMPROCS}) diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 index 3a707afea3e..c4e6cce6c8f 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 @@ -20,8 +20,7 @@ PROGRAM DATASET_BY_CHUNK INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/4,8/) ! Dataset dimensions ! in the file. -! INTEGER, DIMENSION(7) :: dimsfi = (/4,8,0,0,0,0,0/) - INTEGER(HSIZE_T), DIMENSION (2) :: dimsfi = (/4,8/) + INTEGER(HSIZE_T), DIMENSION(2) :: dimsfi = (/4,8/) INTEGER(HSIZE_T), DIMENSION(2) :: chunk_dims = (/2,4/) ! Chunks dimensions INTEGER(HSIZE_T), DIMENSION(2) :: count diff --git a/configure.ac b/configure.ac index 689ab3d2a42..17d0e1e2362 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file