mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-12 17:31:09 +08:00
Merge pull request #1544 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b5a4f470cdf7113c0691cca6fb201672c4e1d86d': Use STREQUAL Add command to build options and check defines Skip testing of cache_image test CMake if statement correction
This commit is contained in:
Allen Byrne
commit
81687043d4
@ -277,7 +277,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
|
||||
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
|
||||
else ()
|
||||
file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
|
||||
if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
|
||||
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
|
||||
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
|
||||
else ()
|
||||
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
|
||||
@ -296,7 +296,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
|
||||
file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
|
||||
file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}.log ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}_Serial.log)
|
||||
unset(result CACHE)
|
||||
if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
|
||||
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
|
||||
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
|
||||
else ()
|
||||
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
|
||||
|
||||
@ -101,45 +101,48 @@ endif ()
|
||||
###################################################################
|
||||
######### Following describes compiler ############
|
||||
if (NOT DEFINED HPC)
|
||||
if (NOT DEFINED BUILD_GENERATOR)
|
||||
message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
|
||||
endif ()
|
||||
if (WIN32)
|
||||
set (SITE_OS_NAME "Windows")
|
||||
set (SITE_OS_VERSION "WIN7")
|
||||
if (${BUILD_GENERATOR} STREQUAL "VS201764")
|
||||
if (BUILD_GENERATOR STREQUAL "VS201764")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2017")
|
||||
set (SITE_COMPILER_VERSION "15")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2017")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS2017")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2017")
|
||||
set (SITE_COMPILER_VERSION "15")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201564")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS201564")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2015")
|
||||
set (SITE_COMPILER_VERSION "14")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2015")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS2015")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2015")
|
||||
set (SITE_COMPILER_VERSION "14")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201364")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS201364")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2013")
|
||||
set (SITE_COMPILER_VERSION "12")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2013")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS2013")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2013")
|
||||
set (SITE_COMPILER_VERSION "12")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201264")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS201264")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2012")
|
||||
set (SITE_COMPILER_VERSION "11")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2012")
|
||||
elseif (BUILD_GENERATOR STREQUAL "VS2012")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2012")
|
||||
|
||||
@ -33,6 +33,7 @@ set (LOCAL_BATCH_TEST "TRUE")
|
||||
set (LOCAL_BATCH_SCRIPT_NAME "ray_ctestS.lsf")
|
||||
set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ray_ctestP.lsf")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_COMMAND:STRING=${LOCAL_BATCH_SCRIPT_COMMAND}")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=mpirun")
|
||||
|
||||
@ -944,7 +944,7 @@ if (BUILD_SHARED_LIBS)
|
||||
endif ()
|
||||
|
||||
if (LOCAL_BATCH_TEST)
|
||||
if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
|
||||
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
|
||||
configure_file (
|
||||
${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_COMMAND}
|
||||
${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_COMMAND} ESCAPE_QUOTES @ONLY
|
||||
|
||||
@ -660,6 +660,7 @@ if (NOT CYGWIN)
|
||||
set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
|
||||
endif ()
|
||||
|
||||
if (TEST_CACHE_IMAGE)
|
||||
#-- Adding test for cache_image
|
||||
add_test (
|
||||
NAME H5TEST-clear-cache_image-objects
|
||||
@ -676,6 +677,7 @@ set_tests_properties (H5TEST-cache_image PROPERTIES
|
||||
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
|
||||
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
|
||||
)
|
||||
endif ()
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
#-- Adding test for cache
|
||||
|
||||
@ -92,6 +92,7 @@ endif ()
|
||||
|
||||
set (H5_VFD_SKIP_TESTS
|
||||
cache
|
||||
cache_image
|
||||
accum
|
||||
fheap
|
||||
big
|
||||
|
||||
@ -89,6 +89,7 @@ endif ()
|
||||
|
||||
set (H5_VOL_SKIP_TESTS
|
||||
cache
|
||||
cache_image
|
||||
accum
|
||||
fheap
|
||||
big
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user