mirror of https://github.com/ecmwf/eccodes.git
ECC-1536: Testing: Speed up the BUFR downloads by running them in parallel
This commit is contained in:
parent
d8b26817df
commit
50138bd42b
|
@ -12,13 +12,18 @@ file(READ "bufr_ref_files.txt" bufr_refs_to_download)
|
||||||
string(REGEX REPLACE "\n" ";" bufr_refs_to_download "${bufr_refs_to_download}")
|
string(REGEX REPLACE "\n" ";" bufr_refs_to_download "${bufr_refs_to_download}")
|
||||||
|
|
||||||
# Exceptional case: download bufr files which have to be treated specially
|
# Exceptional case: download bufr files which have to be treated specially
|
||||||
list(APPEND bufr_refs_to_download "vos308014_v3_26.bufr") # See test ecc-197
|
list(APPEND bufr_files_to_download "vos308014_v3_26.bufr") # See test ecc-197
|
||||||
|
|
||||||
if( ENABLE_EXTRA_TESTS )
|
if( ENABLE_EXTRA_TESTS )
|
||||||
ecbuild_get_test_multidata(
|
ecbuild_get_test_multidata(
|
||||||
TARGET eccodes_download_bufrs
|
TARGET eccodes_download_bufrs
|
||||||
NOCHECK
|
NOCHECK
|
||||||
NAMES ${bufr_files_to_download} ${bufr_refs_to_download}
|
NAMES ${bufr_files_to_download}
|
||||||
|
)
|
||||||
|
ecbuild_get_test_multidata(
|
||||||
|
TARGET eccodes_download_bufr_refs
|
||||||
|
NOCHECK
|
||||||
|
NAMES ${bufr_refs_to_download}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,7 @@ foreach( test ${tests_extra} )
|
||||||
TYPE SCRIPT
|
TYPE SCRIPT
|
||||||
CONDITION ENABLE_EXTRA_TESTS
|
CONDITION ENABLE_EXTRA_TESTS
|
||||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
|
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
|
||||||
TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs )
|
TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs eccodes_download_bufr_refs )
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# Tests which are conditional
|
# Tests which are conditional
|
||||||
|
|
|
@ -115,7 +115,7 @@ foreach( tool ${tests_extra} )
|
||||||
CONDITION HAVE_FORTRAN AND ENABLE_EXTRA_TESTS
|
CONDITION HAVE_FORTRAN AND ENABLE_EXTRA_TESTS
|
||||||
RESOURCES bufr_read_scatterometer_f.ref
|
RESOURCES bufr_read_scatterometer_f.ref
|
||||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
|
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
|
||||||
TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs )
|
TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs eccodes_download_bufr_refs )
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# Test for CCSDS (AEC) packing
|
# Test for CCSDS (AEC) packing
|
||||||
|
|
|
@ -313,7 +313,8 @@ if( HAVE_BUILD_TOOLS )
|
||||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
|
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
|
||||||
RESOURCES asca_139.t1.ref
|
RESOURCES asca_139.t1.ref
|
||||||
TEST_DEPENDS eccodes_download_gribs eccodes_download_tigge_gribs
|
TEST_DEPENDS eccodes_download_gribs eccodes_download_tigge_gribs
|
||||||
eccodes_download_bufrs eccodes_download_metars eccodes_download_gts )
|
eccodes_download_bufrs eccodes_download_bufr_refs
|
||||||
|
eccodes_download_metars eccodes_download_gts )
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if( HAVE_FORTRAN AND ENABLE_EXTRA_TESTS )
|
if( HAVE_FORTRAN AND ENABLE_EXTRA_TESTS )
|
||||||
|
@ -350,7 +351,7 @@ if( HAVE_BUILD_TOOLS )
|
||||||
TYPE SCRIPT
|
TYPE SCRIPT
|
||||||
CONDITION NOT ECCODES_ON_WINDOWS AND ENABLE_EXTRA_TESTS
|
CONDITION NOT ECCODES_ON_WINDOWS AND ENABLE_EXTRA_TESTS
|
||||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufr_ecc-1288.sh
|
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufr_ecc-1288.sh
|
||||||
TEST_DEPENDS eccodes_download_bufrs )
|
TEST_DEPENDS eccodes_download_bufrs eccodes_download_bufr_refs )
|
||||||
|
|
||||||
|
|
||||||
if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )
|
if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )
|
||||||
|
|
Loading…
Reference in New Issue