mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-25 15:10:09 -05:00
opm_add_test: EXE_NAME is renamed to EXE_TARGET
This commit is contained in:
Arne Morten Kvarving committed
1 parent
1080f7575a
commit
cedd916154
3 files changed
+92
-59
No files matched your search
+75
-42
@@ -42,20 +42,25 @@ function(add_test_runSimulator)
|
||||
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
|
||||
-r ${RESULT_PATH}
|
||||
-f ${PARAM_FILENAME})
|
||||
if(PARAM_PROCS)
|
||||
list(APPEND DRIVER_ARGS -n ${PARAM_PROCS})
|
||||
endif()
|
||||
if(PARAM_POST_COMMAND)
|
||||
list(APPEND DRIVER_ARGS -p "${PARAM_POST_COMMAND}")
|
||||
endif()
|
||||
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
|
||||
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
|
||||
endif()
|
||||
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS}
|
||||
CONFIGURATION ${PARAM_CONFIGURATION})
|
||||
if(PARAM_PROCS)
|
||||
list(APPEND DRIVER_ARGS -n ${PARAM_PROCS})
|
||||
endif()
|
||||
if(PARAM_POST_COMMAND)
|
||||
list(APPEND DRIVER_ARGS -p "${PARAM_POST_COMMAND}")
|
||||
endif()
|
||||
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
|
||||
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
|
||||
endif()
|
||||
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${TEST_ARGS}
|
||||
CONFIGURATION
|
||||
${PARAM_CONFIGURATION}
|
||||
)
|
||||
if(PARAM_PROCS)
|
||||
set_tests_properties(runSimulator/${PARAM_CASENAME} PROPERTIES PROCESSORS ${PARAM_PROCS})
|
||||
endif()
|
||||
@@ -112,9 +117,13 @@ function(add_test_compareECLFiles)
|
||||
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
|
||||
endif()
|
||||
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} PROPERTIES
|
||||
DIRNAME ${PARAM_DIR}
|
||||
FILENAME ${PARAM_FILENAME}
|
||||
@@ -179,9 +188,13 @@ function(add_test_compareSeparateECLFiles)
|
||||
list(APPEND DRIVER_ARGS -y ${PARAM_IGNORE_EXTRA_KW})
|
||||
endif()
|
||||
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} PROPERTIES
|
||||
DIRNAME ${PARAM_DIR}
|
||||
FILENAME1 ${PARAM_FILENAME1}
|
||||
@@ -233,16 +246,20 @@ function(add_test_compare_restarted_simulation)
|
||||
|
||||
set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
|
||||
opm_add_test(${TEST_NAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
|
||||
-r ${RESULT_PATH}
|
||||
-f ${PARAM_FILENAME}
|
||||
-a ${PARAM_ABS_TOL}
|
||||
-t ${PARAM_REL_TOL}
|
||||
-c $<TARGET_FILE:compareECL>
|
||||
-d $<TARGET_FILE:rst_deck>
|
||||
-s ${PARAM_RESTART_STEP}
|
||||
TEST_ARGS ${PARAM_TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
-i ${OPM_TESTS_ROOT}/${PARAM_DIR}
|
||||
-r ${RESULT_PATH}
|
||||
-f ${PARAM_FILENAME}
|
||||
-a ${PARAM_ABS_TOL}
|
||||
-t ${PARAM_REL_TOL}
|
||||
-c $<TARGET_FILE:compareECL>
|
||||
-d $<TARGET_FILE:rst_deck>
|
||||
-s ${PARAM_RESTART_STEP}
|
||||
TEST_ARGS
|
||||
${PARAM_TEST_ARGS}
|
||||
)
|
||||
endfunction()
|
||||
|
||||
###########################################################################
|
||||
@@ -305,9 +322,13 @@ function(add_test_compare_parallel_simulation)
|
||||
|
||||
# Add test that runs flow_mpi and outputs the results to file
|
||||
opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}${PARAM_POSTFIX} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}${PARAM_POSTFIX}
|
||||
PROPERTIES PROCESSORS ${MPI_PROCS})
|
||||
endif()
|
||||
@@ -374,9 +395,13 @@ function(add_test_compare_parallel_restarted_simulation)
|
||||
-n ${MPI_PROCS})
|
||||
|
||||
opm_add_test(${TEST_NAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${PARAM_TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${PARAM_TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCS})
|
||||
endif()
|
||||
endfunction()
|
||||
@@ -429,9 +454,13 @@ function(add_test_split_comm)
|
||||
-c $<TARGET_FILE:compareECL>)
|
||||
|
||||
opm_add_test(compareParallelSplitComm_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${PARAM_TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${PARAM_TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(compareParallelSplitComm_${PARAM_SIMULATOR}+${PARAM_FILENAME}
|
||||
PROPERTIES PROCESSORS ${MPI_PROCS})
|
||||
endfunction()
|
||||
@@ -488,9 +517,13 @@ function(add_test_compareDamarisFiles)
|
||||
-n ${MPI_PROCS})
|
||||
set(TEST_NAME ${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME})
|
||||
opm_add_test(${TEST_NAME} NO_COMPILE
|
||||
EXE_NAME ${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS ${DRIVER_ARGS}
|
||||
TEST_ARGS ${TEST_ARGS})
|
||||
EXE_TARGET
|
||||
${PARAM_SIMULATOR}
|
||||
DRIVER_ARGS
|
||||
${DRIVER_ARGS}
|
||||
TEST_ARGS
|
||||
${TEST_ARGS}
|
||||
)
|
||||
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCS}
|
||||
DIRNAME ${PARAM_DIR}
|
||||
FILENAME ${PARAM_FILENAME}
|
||||
|
||||
+9
-9
@@ -2,7 +2,7 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-vtu-test.sh "--simulation")
|
||||
|
||||
opm_add_test(art2dgf
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
art2dgf
|
||||
DRIVER_ARGS
|
||||
--plain
|
||||
@@ -19,7 +19,7 @@ foreach(tgt lens_immiscible_ecfv_ad
|
||||
lens_immiscible_vcfv_fd)
|
||||
opm_add_test(${tgt}
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
${tgt}
|
||||
TEST_ARGS
|
||||
--end-time=3000
|
||||
@@ -30,7 +30,7 @@ endforeach()
|
||||
|
||||
opm_add_test(waterair_pvs_ni
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
waterair_pvs_ni
|
||||
TEST_ARGS
|
||||
--grid-global-refinements=1
|
||||
@@ -85,7 +85,7 @@ endif()
|
||||
foreach(tgt ${PLAIN_TGT})
|
||||
opm_add_test(${tgt}
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
${tgt}
|
||||
WORKING_DIRECTORY
|
||||
${PROJECT_BINARY_DIR}/tests
|
||||
@@ -98,7 +98,7 @@ foreach(tgt reservoir_blackoil_ecfv
|
||||
reservoir_ncp_vcfv)
|
||||
opm_add_test(${tgt}
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
${tgt}
|
||||
TEST_ARGS
|
||||
--end-time=8750000
|
||||
@@ -110,7 +110,7 @@ endforeach()
|
||||
if(dune-alugrid_FOUND)
|
||||
opm_add_test(fracture_discretefracture
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
fracture_discretefracture
|
||||
TEST_ARGS
|
||||
--end-time=400
|
||||
@@ -122,7 +122,7 @@ endif()
|
||||
if(dune-alugrid_FOUND AND dune-fem_FOUND)
|
||||
opm_add_test(finger_immiscible_ecfv_adaptive
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
finger_immiscible_ecfv
|
||||
TEST_ARGS
|
||||
--enable-grid-adaptation=true
|
||||
@@ -135,7 +135,7 @@ endif()
|
||||
|
||||
opm_add_test(obstacle_immiscible_parameters
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
obstacle_immiscible
|
||||
DRIVER_ARGS
|
||||
--parameters
|
||||
@@ -145,7 +145,7 @@ opm_add_test(obstacle_immiscible_parameters
|
||||
|
||||
opm_add_test(obstacle_pvs_restart
|
||||
NO_COMPILE
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
obstacle_pvs
|
||||
TEST_ARGS
|
||||
--pvs-verbosity=2
|
||||
|
||||
@@ -33,7 +33,7 @@ opm_add_test(test_gatherdeferredlogger
|
||||
)
|
||||
|
||||
opm_add_test(test_parallelwellinfo_mpi
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_parallelwellinfo
|
||||
DRIVER_ARGS
|
||||
-n 4
|
||||
@@ -44,7 +44,7 @@ opm_add_test(test_parallelwellinfo_mpi
|
||||
|
||||
foreach(NPROC 2 3 4)
|
||||
opm_add_test(test_parallel_wbp_sourcevalues_np${NPROC}
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_parallel_wbp_sourcevalues
|
||||
DRIVER_ARGS
|
||||
-n ${NPROC}
|
||||
@@ -66,7 +66,7 @@ opm_add_executable(
|
||||
)
|
||||
|
||||
opm_add_test(test_parallel_wbp_calculation_create
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_parallel_wbp_calculation
|
||||
DRIVER_ARGS
|
||||
-n 2
|
||||
@@ -78,7 +78,7 @@ opm_add_test(test_parallel_wbp_calculation_create
|
||||
)
|
||||
|
||||
opm_add_test(test_parallel_wbp_calculation_well_openconns
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_parallel_wbp_calculation
|
||||
DRIVER_ARGS
|
||||
-n 2
|
||||
@@ -91,7 +91,7 @@ opm_add_test(test_parallel_wbp_calculation_well_openconns
|
||||
|
||||
foreach(NPROC 2 3 4)
|
||||
opm_add_test(test_rftcontainer_np${NPROC}
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_rftcontainer
|
||||
DRIVER_ARGS
|
||||
-n ${NPROC}
|
||||
@@ -103,7 +103,7 @@ endforeach()
|
||||
|
||||
foreach(NPROC 2 3 4)
|
||||
opm_add_test(test_parallel_region_phase_pvaverage_np${NPROC}
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_region_phase_pvaverage
|
||||
DRIVER_ARGS
|
||||
-n ${NPROC}
|
||||
@@ -117,7 +117,7 @@ endforeach()
|
||||
|
||||
foreach(NPROC 2 3 4)
|
||||
opm_add_test(test_parallel_satfunc_consistency_checks_np${NPROC}
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_SatfuncConsistencyChecks_parallel
|
||||
DRIVER_ARGS
|
||||
-n ${NPROC}
|
||||
@@ -175,7 +175,7 @@ opm_add_test(test_HDF5Serializer_Parallel
|
||||
)
|
||||
|
||||
opm_add_test(test_rstconv_parallel
|
||||
EXE_NAME
|
||||
EXE_TARGET
|
||||
test_rstconv
|
||||
DRIVER_ARGS
|
||||
-n 4
|
||||
|
||||
Reference in new issue
Block a user