mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2821b8bd768138db6b5f917a5b7325f878f8f7d0': Fix URL name DAILYTEST-250 change test props to reduce timeout
This commit is contained in:
commit
7eda1e3c6a
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
#ifdef __cplusplus
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
/*
|
||||
* For details of the HDF libraries, see the HDF Documentation at:
|
||||
* http://hdfdfgroup.org/HDF5/doc/
|
||||
* http://hdfgroup.org/HDF5/doc/
|
||||
*
|
||||
*/
|
||||
/*
|
||||
|
@ -750,7 +750,7 @@ if (NOT CYGWIN)
|
||||
endif ()
|
||||
set_tests_properties (H5TEST-cache PROPERTIES
|
||||
DEPENDS H5TEST-clear-cache-objects
|
||||
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
|
||||
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=3"
|
||||
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
|
||||
)
|
||||
set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT 1800)
|
||||
@ -768,7 +768,7 @@ add_test (
|
||||
add_test (NAME H5TEST-cache_image COMMAND $<TARGET_FILE:cache_image>)
|
||||
set_tests_properties (H5TEST-cache_image PROPERTIES
|
||||
DEPENDS H5TEST-clear-cache_image-objects
|
||||
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
|
||||
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=3"
|
||||
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user