diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index d455be7384..5a70d75221 100644 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -387,6 +387,42 @@ function(add_test_compareDamarisFiles) TESTNAME ${PARAM_CASENAME}) endfunction() +########################################################################### + +# Adds several tests cases with similar parameters +# cases Variable name of list with test cases +# prefix Prefix to use +# argn Parameters for cases +macro(add_multiple_tests cases prefix) + foreach(case ${${cases}}) + string(TOLOWER ${case} test) + add_test_compareECLFiles( + CASENAME ${prefix}${test} + FILENAME ${case} + ${ARGN} + ) + endforeach() +endmacro() + +########################################################################### + +# Adds several tests cases in a numerical range with similar parameters +# start Start of range +# end End fof range +# ftemplate File name template to use +# prefix Prefix to use +# argn Parameters for cases +macro(add_multiple_test_range start end ftemplate prefix) + foreach(case RANGE ${start} ${end}) + add_test_compareECLFiles( + CASENAME ${prefix}_${case} + FILENAME ${ftemplate}${case} + ${ARGN} + ) + endforeach() +endmacro() + +########################################################################### if(NOT TARGET test-suite) add_custom_target(test-suite) diff --git a/regressionTests.cmake b/regressionTests.cmake index b29150ae2e..20548013e0 100644 --- a/regressionTests.cmake +++ b/regressionTests.cmake @@ -6,37 +6,6 @@ set(abs_tol 2e-2) set(rel_tol 1e-5) set(coarse_rel_tol 1e-2) -# Adds several tests cases with similar parameters -# cases Variable name of list with test cases -# prefix Prefix to use -# argn Parameters for cases -macro(add_multiple_tests cases prefix) - foreach(case ${${cases}}) - string(TOLOWER ${case} test) - add_test_compareECLFiles( - CASENAME ${prefix}${test} - FILENAME ${case} - ${ARGN} - ) - endforeach() -endmacro() - -# Adds several tests cases in a numerical range with similar parameters -# start Start of range -# end End fof range -# ftemplate File name template to use -# prefix Prefix to use -# argn Parameters for cases -macro(add_multiple_test_range start end ftemplate prefix) - foreach(case RANGE ${start} ${end}) - add_test_compareECLFiles( - CASENAME ${prefix}_${case} - FILENAME ${ftemplate}${case} - ${ARGN} - ) - endforeach() -endmacro() - add_test_compareECLFiles(CASENAME spe1flowexp FILENAME SPE1CASE2 SIMULATOR flowexp_blackoil