mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r24948] Group tests by Common name

Browse Source 
Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32

Tested: local linux CMake
This commit is contained in:
Allen Byrne 2014-04-02 13:35:01 -05:00
parent 5555f057ae
commit 98bbf4a36a
20 changed files with 154 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -449,9 +449,9 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
endif (MSVC)
if (WIN32 AND NOT CYGWIN)
if (WIN32)
add_definitions (-D_CRT_SECURE_NO_WARNINGS)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
# Borland uses -w- to suppress warnings.
if (BORLAND)
set (HDF5_WARNINGS_BLOCKED 1)
@ -726,7 +726,7 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
# Note: Currently CMake only allows configuring of threadsafe on
# non-Cygwin WINDOWS.
#-----------------------------------------------------------------------------
if (WIN32 AND NOT CYGWIN)
if (WIN32)
option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
if (HDF5_ENABLE_THREADSAFE)
# check for unsupported options
@ -750,7 +750,7 @@ if (WIN32 AND NOT CYGWIN)
endif (NOT H5_HAVE_PTHREAD_H)
endif (H5_HAVE_IOEO)
endif (HDF5_ENABLE_THREADSAFE)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
# -----------------------------------------------------------------------
# wrapper script variables

10
bin/cmakehdf5
View File

@ -101,16 +101,16 @@ echo Running Cmake for HDF5-${version} ...
# 4. Configure the C library, tools and tests with this command:
STEP "Configure..." "cmake -G 'Unix Makefiles' -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ../hdf5" $configlog
# 3. Build the C library, tools and tests with this command:
# 5. Build the C library, tools and tests with this command:
STEP "Build the library, tools and tests, ..." "cmake --build . --config Release" $makelog
# 4. Test the C library and tools with this command:
# 6. Test the C library and tools with this command:
STEP "Test the library and tools..." "ctest . -C Release" $testlog
# 5. Create an install image with this command:
# 7. Create an install image with this command:
STEP "Create an install image..." "cpack -C Release CPackConfig.cmake" $packlog
# 6. Install with this command:
# 8. Install with this command:
STEP "Install..." "./HDF5-${version}-Linux.sh --skip-license" $installlog
# save the last exit code
exit_code=$?
@ -199,7 +199,7 @@ set (SITE_BUILDNAME_SUFFIX "cmakehdf5")
set (LOCAL_SKIP_UPDATE TRUE)
set (REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/branches/hdf5_1_8")
# -- Standard build options
set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=/usr/local/hdf5.1.8 -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${CTEST_BINARY_DIRECTORY} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
# Use multiple CPU cores to build
include(ProcessorCount)

34
c++/examples/CMakeTests.cmake
View File

@ -6,7 +6,7 @@
##############################################################################
# Remove any output file left over from previous test run
add_test (
NAME cpp_ex-clear-objects
NAME CPP_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
Group.h5
@ -16,23 +16,23 @@
Select.h5
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (cpp_ex-clear-objects PROPERTIES DEPENDS ${last_test})
set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "cpp_ex-clear-objects")
set (last_test "CPP_ex-clear-objects")
foreach (example ${examples})
add_test (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (cpp_ex_${example} PROPERTIES DEPENDS ${last_test})
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "cpp_ex_${example}")
set (last_test "CPP_ex_${example}")
endforeach (example ${examples})
#the following dependicies are handled by the order of the files
# SET_TESTS_PROPERTIES(cpp_ex_readdata PROPERTIES DEPENDS cpp_ex_create)
# SET_TESTS_PROPERTIES(cpp_ex_chunks PROPERTIES DEPENDS cpp_ex_extend_ds)
# SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
# SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
add_test (
NAME cpp_ex_tutr-clear-objects
NAME CPP_ex_tutr-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
h5tutr_cmprss.h5
@ -43,19 +43,19 @@
h5tutr_subset.h5
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (cpp_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "cpp_ex_tutr-clear-objects")
set (last_test "CPP_ex_tutr-clear-objects")
foreach (example ${tutr_examples})
add_test (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (cpp_ex_${example} PROPERTIES DEPENDS ${last_test})
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "cpp_ex_${example}")
set (last_test "CPP_ex_${example}")
endforeach (example ${tutr_examples})
#the following dependicies are handled by the order of the files
# SET_TESTS_PROPERTIES(cpp_ex_h5tutr_crtatt PROPERTIES DEPENDS cpp_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(cpp_ex_h5tutr_rdwt PROPERTIES DEPENDS cpp_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(cpp_ex_h5tutr_crtgrpd PROPERTIES DEPENDS cpp_ex_h5tutr_crtgrpar)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtgrpd PROPERTIES DEPENDS CPP_ex_h5tutr_crtgrpar)

12
c++/test/CMakeTests.cmake
View File

@ -6,7 +6,7 @@
##############################################################################
# Remove any output file left over from previous test run
add_test (
NAME cpp_testhdf5-clear-objects
NAME CPP_testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tattr_basic.h5
@ -17,8 +17,8 @@ add_test (
tfattrs.h5
)
add_test (NAME cpp_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
set_tests_properties (cpp_testhdf5 PROPERTIES DEPENDS cpp_testhdf5-clear-objects)
add_test (NAME CPP_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects)
if (HDF5_TEST_VFD)
@ -38,7 +38,7 @@ if (HDF5_TEST_VFD)
MACRO (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME VFD-${vfdname}-cpp_testhdf5-clear-objects
NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tattr_basic.h5
@ -49,7 +49,7 @@ if (HDF5_TEST_VFD)
tfattrs.h5
)
add_test (
NAME VFD-${vfdname}-cpp_testhdf5
NAME CPP_VFD-${vfdname}-cpp_testhdf5
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
-D "TEST_ARGS:STRING="
@ -59,7 +59,7 @@ if (HDF5_TEST_VFD)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF5_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS VFD-${vfdname}-cpp_testhdf5-clear-objects)
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_VFD_TEST)

36
config/cmake/CTestCustom.cmake
View File

@ -19,25 +19,25 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
set (CTEST_CUSTOM_MEMCHECK_IGNORE
${CTEST_CUSTOM_MEMCHECK_IGNORE}
flush1 #designed to fail
flush2 #designed to need flush1
error_test #uses runTest.cmake
err_compat #uses runTest.cmake
links_env #uses runTest.cmake
testlibinfo #uses grepTest.cmake
h5test-clear-testhdf5-objects
h5test-clear-objects
h5test-clear-cache-objects
h5test-clear-cache_api-objects
h5test-clear-cache_tagging-objects
h5test-clear-ttsafe-objects
h5test-clear-err_compat-objects
h5test-clear-error_test-objects
h5test-clear-links_env-objects
H5TEST-flush1 #designed to fail
H5TEST-flush2 #designed to need flush1
H5TEST-error_test #uses runTest.cmake
H5TEST-err_compat #uses runTest.cmake
H5TEST-links_env #uses runTest.cmake
H5TEST-testlibinfo #uses grepTest.cmake
H5TEST-clear-testhdf5-objects
H5TEST-clear-objects
H5TEST-clear-cache-objects
H5TEST-clear-cache_api-objects
H5TEST-clear-cache_tagging-objects
H5TEST-clear-ttsafe-objects
H5TEST-clear-err_compat-objects
H5TEST-clear-error_test-objects
H5TEST-clear-links_env-objects
PERFORM_h5perform-clear-objects
HL_TOOLS-clear-objects
hl_test-clear-objects
hl_fortran_test-clear-objects
HL_test-clear-objects
HL_fortran_test-clear-objects
######### tools/h5copy #########
H5COPY-clearall-objects
######### tools/h5diff #########
@ -211,5 +211,5 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5MKGRP-clearall-objects
######### examples #########
EXAMPLES-clear-objects
cpp_ex-clear-objects
CPP_ex-clear-objects
)

12
fortran/examples/CMakeLists.txt
View File

@ -42,12 +42,12 @@ foreach (example ${examples})
add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
TARGET_NAMING (f90_ex_${example} ${LIB_TYPE})
TARGET_FORTRAN_PROPERTIES (f90_ex_${example} " " " ")
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set_property (TARGET f90_ex_${example}
APPEND PROPERTY COMPILE_DEFINITIONS
HDF5F90_WINDOWS
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
target_link_libraries (f90_ex_${example}
${HDF5_F90_LIB_TARGET}
${HDF5_LIB_TARGET}
@ -61,11 +61,11 @@ if (HDF5_ENABLE_F2003)
add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
TARGET_FORTRAN_PROPERTIES (f03_ex_${example} " " " ")
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set_property (TARGET f03_ex_${example}
APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
target_link_libraries (f03_ex_${example}
${HDF5_F90_LIB_TARGET}
${HDF5_LIB_TARGET}
@ -79,12 +79,12 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
TARGET_NAMING (f90_ex_ph5example ${LIB_TYPE})
TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example " " " ")
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set_property (TARGET f90_ex_ph5example
APPEND PROPERTY COMPILE_DEFINITIONS
HDF5F90_WINDOWS
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
target_link_libraries (f90_ex_ph5example
${HDF5_F90_LIB_TARGET}
${HDF5_LIB_TARGET}

4
fortran/test/CMakeLists.txt
View File

@ -23,7 +23,7 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90)
set (SHARED_LINK_FLAGS " ")
if (WIN32 AND NOT CYGWIN)
if (WIN32)
if (BUILD_SHARED_LIBS)
set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL)
if (MSVC)
@ -31,7 +31,7 @@ if (WIN32 AND NOT CYGWIN)
endif (MSVC)
endif (BUILD_SHARED_LIBS)
set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
TARGET_FORTRAN_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}

18
fortran/test/CMakeTests.cmake
View File

@ -5,22 +5,22 @@
##############################################################################
##############################################################################
add_test (NAME testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
SET_TESTS_PROPERTIES(testhdf5_fortran PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
add_test (NAME FORTRAN_testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
SET_TESTS_PROPERTIES(FORTRAN_testhdf5_fortran PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
#-- Adding test for testhdf5_fortran_1_8
add_test (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
SET_TESTS_PROPERTIES(testhdf5_fortran_1_8 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
add_test (NAME FORTRAN_testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
SET_TESTS_PROPERTIES(FORTRAN_testhdf5_fortran_1_8 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
#-- Adding test for fortranlib_test_F03
if (HDF5_ENABLE_F2003)
add_test (NAME fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>)
SET_TESTS_PROPERTIES(fortranlib_test_F03 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
add_test (NAME FORTRAN_fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>)
SET_TESTS_PROPERTIES(FORTRAN_fortranlib_test_F03 PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
endif (HDF5_ENABLE_F2003)
#-- Adding test for fflush1
add_test (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
add_test (NAME FORTRAN_fflush1 COMMAND $<TARGET_FILE:fflush1>)
#-- Adding test for fflush2
add_test (NAME fflush2 COMMAND $<TARGET_FILE:fflush2>)
SET_TESTS_PROPERTIES(fflush2 PROPERTIES DEPENDS fflush1)
add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
SET_TESTS_PROPERTIES(FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)

2
fortran/testpar/CMakeTests.cmake
View File

@ -4,4 +4,4 @@
### T E S T I N G ###
##############################################################################
##############################################################################
add_test (NAME parallel_test COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:parallel_test>)
add_test (NAME FORT_parallel_test COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:parallel_test>)

6
hl/c++/examples/CMakeTests.cmake
View File

@ -6,11 +6,11 @@
##############################################################################
# Remove any output file left over from previous test run
add_test (
NAME cpp_hl_ex_ptExampleFL-clear-objects
NAME HL_CPP_ex_ptExampleFL-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
PTcppexampleFL.h5
)
add_test (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
set_tests_properties (cpp_hl_ex_ptExampleFL PROPERTIES DEPENDS cpp_hl_ex_ptExampleFL-clear-objects)
add_test (NAME HL_CPP_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
set_tests_properties (HL_CPP_ex_ptExampleFL PROPERTIES DEPENDS HL_CPP_ex_ptExampleFL-clear-objects)

2
hl/c++/test/CMakeTests.cmake
View File

@ -5,4 +5,4 @@
##############################################################################
##############################################################################
add_test (NAME hl_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)
add_test (NAME HL_CPP_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)

12
hl/examples/CMakeTests.cmake
View File

@ -23,7 +23,7 @@ endforeach (h5_file ${HDF5_TEST_FILES})
# Remove any output file left over from previous test run
add_test (
NAME hl_ex-clear-objects
NAME HL_ex-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
ex_lite1.h5
@ -47,14 +47,14 @@ endforeach (h5_file ${HDF5_TEST_FILES})
ex_ds1.h5
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (hl_ex-clear-objects PROPERTIES DEPENDS ${last_test})
set_tests_properties (HL_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "hl_ex-clear-objects")
set (last_test "HL_ex-clear-objects")
foreach (example ${examples})
add_test (NAME hl_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
add_test (NAME HL_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (hl_ex_${example} PROPERTIES DEPENDS ${last_test})
set_tests_properties (HL_ex_${example} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "hl_ex_${example}")
set (last_test "HL_ex_${example}")
endforeach (example ${examples})

2
hl/fortran/examples/CMakeTests.cmake
View File

@ -6,5 +6,5 @@
##############################################################################
foreach (example ${examples})
add_test (NAME hl_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
endforeach (example ${examples})

14
hl/fortran/src/CMakeLists.txt
View File

@ -49,7 +49,7 @@ set (HDF5_HL_F90_F_SRCS
add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
set (SHARED_LINK_FLAGS " ")
if (BUILD_SHARED_LIBS)
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set_property (TARGET ${HDF5_HL_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
BUILD_HDF5_DLL
@ -57,14 +57,14 @@ if (BUILD_SHARED_LIBS)
if (MSVC)
set (SHARED_LINK_FLAGS "/DLL")
endif (MSVC)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
endif (BUILD_SHARED_LIBS)
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set_property (TARGET ${HDF5_HL_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
HDF5F90_WINDOWS
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} " " ${SHARED_LINK_FLAGS})
set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
@ -78,7 +78,7 @@ set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
if (WIN32 AND NOT CYGWIN)
if (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5ds.mod
@ -90,7 +90,7 @@ if (WIN32 AND NOT CYGWIN)
COMPONENT
fortheaders
)
else (WIN32 AND NOT CYGWIN)
else (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/h5ds.mod
@ -102,7 +102,7 @@ else (WIN32 AND NOT CYGWIN)
COMPONENT
fortheaders
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects

14
hl/fortran/test/CMakeTests.cmake
View File

@ -7,7 +7,7 @@
# Remove any output file left over from previous test run
add_test (
NAME hl_fortran_test-clear-objects
NAME HL_FORTRAN_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
dsetf1.h5
@ -20,10 +20,14 @@ add_test (
tstds.h5
)
add_test (NAME hl_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
add_test (NAME HL_FORTRAN_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
set_tests_properties (HL_FORTRAN_f90_tstds PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
add_test (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
add_test (NAME HL_FORTRAN_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
set_tests_properties (HL_FORTRAN_f90_tstlite PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
add_test (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
add_test (NAME HL_FORTRAN_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
set_tests_properties (HL_FORTRAN_f90_tstimage PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
add_test (NAME hl_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
add_test (NAME HL_FORTRAN_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
set_tests_properties (HL_FORTRAN_f90_tsttable PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)

10
hl/test/CMakeTests.cmake
View File

@ -9,9 +9,9 @@
# Macro used to add a unit test
# --------------------------------------------------------------------
MACRO (HL_ADD_TEST hl_name files)
add_test (NAME hl_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
add_test (NAME HL_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (hl_${hl_name} PROPERTIES DEPENDS ${last_test})
set_tests_properties (HL_${hl_name} PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
# --------------------------------------------------------------------
@ -32,7 +32,7 @@ ENDMACRO (HL_ADD_TEST)
# Remove any output file left over from previous test run
add_test (
NAME hl_test-clear-objects
NAME HL_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
combine_tables1.h5
@ -61,9 +61,9 @@ add_test (
test_table.h5
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (hl_test-clear-objects PROPERTIES DEPENDS ${last_test})
set_tests_properties (HL_test-clear-objects PROPERTIES DEPENDS ${last_test})
endif (NOT "${last_test}" STREQUAL "")
set (last_test "hl_test-clear-objects")
set (last_test "HL_test-clear-objects")
HL_add_test (test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5")
HL_add_test (test_dset_opt "")

90
test/CMakeTests.cmake
View File

@ -138,7 +138,7 @@ endforeach (h5_file ${HDF5_REFERENCE_TEST_FILES})
# Remove any output file left over from previous test run
add_test (
NAME h5test-clear-testhdf5-objects
NAME H5TEST-clear-testhdf5-objects
COMMAND ${CMAKE_COMMAND}
-E remove
coord.h5
@ -161,21 +161,21 @@ add_test (
)
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME testhdf5-base COMMAND $<TARGET_FILE:testhdf5> -x heap -x file -x select)
set_tests_properties (testhdf5-base PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
set_tests_properties (testhdf5-base PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME testhdf5-heap COMMAND $<TARGET_FILE:testhdf5> -o heap)
set_tests_properties (testhdf5-heap PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
set_tests_properties (testhdf5-heap PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME testhdf5-file COMMAND $<TARGET_FILE:testhdf5> -o file)
set_tests_properties (testhdf5-file PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
set_tests_properties (testhdf5-file PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME testhdf5-select COMMAND $<TARGET_FILE:testhdf5> -o select)
set_tests_properties (testhdf5-select PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
set_tests_properties (testhdf5-select PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME H5TEST-testhdf5-base COMMAND $<TARGET_FILE:testhdf5> -x heap -x file -x select)
set_tests_properties (H5TEST-testhdf5-base PROPERTIES DEPENDS H5TEST-clear-testhdf5-objects)
set_tests_properties (H5TEST-testhdf5-base PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME H5TEST-testhdf5-heap COMMAND $<TARGET_FILE:testhdf5> -o heap)
set_tests_properties (H5TEST-testhdf5-heap PROPERTIES DEPENDS H5TEST-clear-testhdf5-objects)
set_tests_properties (H5TEST-testhdf5-heap PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME H5TEST-testhdf5-file COMMAND $<TARGET_FILE:testhdf5> -o file)
set_tests_properties (H5TEST-testhdf5-file PROPERTIES DEPENDS H5TEST-clear-testhdf5-objects)
set_tests_properties (H5TEST-testhdf5-file PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
add_test (NAME H5TEST-testhdf5-select COMMAND $<TARGET_FILE:testhdf5> -o select)
set_tests_properties (H5TEST-testhdf5-select PROPERTIES DEPENDS H5TEST-clear-testhdf5-objects)
set_tests_properties (H5TEST-testhdf5-select PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
else (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME testhdf5 COMMAND $<TARGET_FILE:testhdf5>)
set_tests_properties (testhdf5 PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
add_test (NAME H5TEST-testhdf5 COMMAND $<TARGET_FILE:testhdf5>)
set_tests_properties (H5TEST-testhdf5 PROPERTIES DEPENDS H5TEST-clear-testhdf5-objects)
endif (HDF5_ENABLE_USING_MEMCHECKER)
##############################################################################
@ -186,7 +186,7 @@ endif (HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME h5test-clear-objects
NAME H5TEST-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
dt_arith1.h5
@ -249,11 +249,11 @@ add_test (
)
foreach (test ${H5_TESTS})
add_test (NAME ${test} COMMAND $<TARGET_FILE:${test}>)
set_tests_properties (${test} PROPERTIES DEPENDS h5test-clear-objects)
add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>)
set_tests_properties (H5TEST-${test} PROPERTIES DEPENDS H5TEST-clear-objects)
endforeach (test ${H5_TESTS})
set_tests_properties (flush2 PROPERTIES DEPENDS flush1)
set_tests_properties (H5TEST-flush2 PROPERTIES DEPENDS flush1)
##############################################################################
##############################################################################
@ -263,38 +263,38 @@ set_tests_properties (flush2 PROPERTIES DEPENDS flush1)
#-- Adding test for cache
add_test (
NAME h5test-clear-cache-objects
NAME H5TEST-clear-cache-objects
COMMAND ${CMAKE_COMMAND}
-E remove
cache_test.h5
)
add_test (NAME cache COMMAND $<TARGET_FILE:cache>)
set_tests_properties (cache PROPERTIES DEPENDS h5test-clear-cache-objects)
add_test (NAME H5TEST-cache COMMAND $<TARGET_FILE:cache>)
set_tests_properties (H5TEST-cache PROPERTIES DEPENDS H5TEST-clear-cache-objects)
#-- Adding test for cache_api
add_test (
NAME h5test-clear-cache_api-objects
NAME H5TEST-clear-cache_api-objects
COMMAND ${CMAKE_COMMAND}
-E remove
cache_api_test.h5
)
add_test (NAME cache_api COMMAND $<TARGET_FILE:cache_api>)
set_tests_properties (cache_api PROPERTIES DEPENDS h5test-clear-cache_api-objects)
add_test (NAME H5TEST-cache_api COMMAND $<TARGET_FILE:cache_api>)
set_tests_properties (H5TEST-cache_api PROPERTIES DEPENDS H5TEST-clear-cache_api-objects)
#-- Adding test for cache_tagging
add_test (
NAME h5test-clear-cache_tagging-objects
NAME H5TEST-clear-cache_tagging-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tagging_test.h5
tagging_ext_test.h5
)
add_test (NAME cache_tagging COMMAND $<TARGET_FILE:cache_tagging>)
set_tests_properties (cache_tagging PROPERTIES DEPENDS h5test-clear-cache_tagging-objects)
add_test (NAME H5TEST-cache_tagging COMMAND $<TARGET_FILE:cache_tagging>)
set_tests_properties (H5TEST-cache_tagging PROPERTIES DEPENDS H5TEST-clear-cache_tagging-objects)
#-- Adding test for ttsafe
add_test (
NAME h5test-clear-ttsafe-objects
NAME H5TEST-clear-ttsafe-objects
COMMAND ${CMAKE_COMMAND}
-E remove
ttsafe_error.h5
@ -302,19 +302,19 @@ add_test (
ttsafe_cancel.h5
ttsafe_acreate.h5
)
add_test (NAME ttsafe COMMAND $<TARGET_FILE:ttsafe>)
set_tests_properties (ttsafe PROPERTIES DEPENDS h5test-clear-ttsafe-objects)
add_test (NAME H5TEST-ttsafe COMMAND $<TARGET_FILE:ttsafe>)
set_tests_properties (H5TEST-ttsafe PROPERTIES DEPENDS H5TEST-clear-ttsafe-objects)
#-- Adding test for err_compat
if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
add_test (
NAME h5test-clear-err_compat-objects
NAME H5TEST-clear-err_compat-objects
COMMAND ${CMAKE_COMMAND}
-E remove
err_compat.txt
err_compat.txt.err
)
add_test (NAME err_compat COMMAND "${CMAKE_COMMAND}"
add_test (NAME H5TEST-err_compat COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:err_compat>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@ -324,18 +324,18 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (err_compat PROPERTIES DEPENDS h5test-clear-err_compat-objects)
set_tests_properties (H5TEST-err_compat PROPERTIES DEPENDS H5TEST-clear-err_compat-objects)
endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
#-- Adding test for error_test
add_test (
NAME h5test-clear-error_test-objects
NAME H5TEST-clear-error_test-objects
COMMAND ${CMAKE_COMMAND}
-E remove
error_test.txt
error_test.txt.err
)
add_test (NAME error_test COMMAND "${CMAKE_COMMAND}"
add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:error_test>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
@ -345,12 +345,12 @@ add_test (NAME error_test COMMAND "${CMAKE_COMMAND}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (error_test PROPERTIES DEPENDS h5test-clear-error_test-objects)
set_tests_properties (error_test PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PRELOAD=::")
set_tests_properties (H5TEST-error_test PROPERTIES DEPENDS H5TEST-clear-error_test-objects)
set_tests_properties (H5TEST-error_test PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PRELOAD=::")
#-- Adding test for links_env
add_test (
NAME h5test-clear-links_env-objects
NAME H5TEST-clear-links_env-objects
COMMAND ${CMAKE_COMMAND}
-E remove
links_env.txt
@ -359,7 +359,7 @@ add_test (
extlinks_env1.h5
tmp/extlinks_env1.h5
)
add_test (NAME links_env COMMAND "${CMAKE_COMMAND}"
add_test (NAME H5TEST-links_env COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:links_env>"
-D "TEST_ARGS:STRING="
-D "TEST_ENV_VAR:STRING=HDF5_EXT_PREFIX"
@ -370,21 +370,21 @@ add_test (NAME links_env COMMAND "${CMAKE_COMMAND}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (links_env PROPERTIES DEPENDS h5test-clear-links_env-objects)
set_tests_properties (H5TEST-links_env PROPERTIES DEPENDS H5TEST-clear-links_env-objects)
#-- Adding test for libinfo
add_test (NAME testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FILE:${HDF5_LIB_TARGET}>" -P "${GREP_RUNNER}")
add_test (NAME H5TEST-testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FILE:${HDF5_LIB_TARGET}>" -P "${GREP_RUNNER}")
##############################################################################
### P L U G I N T E S T S
##############################################################################
if (BUILD_SHARED_LIBS)
if (WIN32 AND NOT CYGWIN)
if (WIN32)
set (CMAKE_SEP "\;")
else (WIN32 AND NOT CYGWIN)
else (WIN32)
set (CMAKE_SEP ":")
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
add_test (NAME H5PLUGIN-plugin COMMAND $<TARGET_FILE:plugin>)
set_tests_properties (H5PLUGIN-plugin PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir1${CMAKE_SEP}${CMAKE_BINARY_DIR}/testdir2")

2
testpar/CMakeTests.cmake
View File

@ -37,7 +37,7 @@ if (HDF5_TEST_VFD)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
foreach (test ${H5P_VFD_TESTS})
add_test (
NAME VFD-${vfdname}-${test}
NAME TEST_PAR_VFD-${vfdname}-${test}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
-D "TEST_ARGS:STRING="

4
tools/h5diff/CMakeTests.cmake
View File

@ -255,7 +255,7 @@
#
# Overwrite system dependent files (Windows)
#
if (WIN32 AND NOT CYGWIN)
if (WIN32)
add_custom_command (
TARGET h5diff
POST_BUILD
@ -282,7 +282,7 @@
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_104w.txt ${PROJECT_BINARY_DIR}/testfiles/h5diff_104.txt
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
##############################################################################
##############################################################################

12
tools/h5dump/CMakeTests.cmake
View File

@ -325,17 +325,17 @@
endforeach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES})
foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
if (WIN32 AND NOT CYGWIN)
if (WIN32)
file (READ ${HDF5_TOOLS_SRC_DIR}/testfiles/${tst_exp_file} TEST_STREAM)
file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} "${TEST_STREAM}")
else (WIN32 AND NOT CYGWIN)
else (WIN32)
add_custom_command (
TARGET h5dump
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${tst_exp_file} ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
endforeach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
foreach (tst_other_file ${HDF5_REFERENCE_FILES})
@ -372,17 +372,17 @@
ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbin1.ddl ${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl
)
if (WIN32 AND NOT CYGWIN)
if (WIN32)
file (READ ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.exp TEST_STREAM)
file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
else (WIN32 AND NOT CYGWIN)
else (WIN32)
add_custom_command (
TARGET h5dump
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp
)
endif (WIN32 AND NOT CYGWIN)
endif (WIN32)
##############################################################################
##############################################################################