Commit 3f1e0368 authored by guillaume pernot's avatar guillaume pernot

Merge branch '1982-fix-test-threads' into 'develop'

TEST: Force ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS=4

Closes #1982

See merge request !617
parents 322f0744 ddf9c196
Pipeline #2891 passed with stages
in 6 minutes and 25 seconds
......@@ -56,6 +56,7 @@ string(TOLOWER ${filter} lfilter)
set(OUTFILE apTvSeSegmentation${filter}${mode}${${lmode}_output_format})
if(NOT (${filter} STREQUAL "Meanshift" AND ${mode} STREQUAL "Raster"))
OTB_TEST_APPLICATION(NAME apTvSeSegmentation${filter}${mode}
APP Segmentation
OPTIONS -in ${INPUTDATA}/WV2_MUL_ROI_1000_100.tif
......@@ -64,6 +65,7 @@ OTB_TEST_APPLICATION(NAME apTvSeSegmentation${filter}${mode}
-mode ${lmode}
-mode.${lmode}.out ${TEMP}/${OUTFILE} ${${lmode}_output_option}
${${lmode}_parameters}
--add-before-env ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS 4
VALID ${${lfilter}_option}
${${lmode}_comparison}
${${lmode}_ref_path}/${OUTFILE}
......
......@@ -33,11 +33,6 @@ otb_module_target_label(otbSmoothingTestDriver)
# Tests Declaration
otb_add_test(NAME bfTvMeanShiftSmoothingImageFilterOptim COMMAND otbSmoothingTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvMeanShiftFilterSpectralOutputOptim.tif
......@@ -51,6 +46,10 @@ otb_add_test(NAME bfTvMeanShiftSmoothingImageFilterOptim COMMAND otbSmoothingTes
2 10 0.1 10 1
)
set_tests_properties(bfTvMeanShiftSmoothingImageFilterOptim PROPERTIES
ENVIRONMENT ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS=4)
otb_add_test(NAME bfTuMeanShiftSmoothingImageFilterSPOT5 COMMAND otbSmoothingTestDriver
otbMeanShiftSmoothingImageFilter
${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment