changed: put dune-enabled tests in separate list

more explicit, neater code
This commit is contained in:
Arne Morten Kvarving 2022-12-21 09:54:36 +01:00
parent 680246b1ca
commit 081715d229
2 changed files with 30 additions and 38 deletions

View File

@ -354,27 +354,8 @@ target_compile_options(dunecommon INTERFACE ${dflags})
target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MAJOR=${DUNE_COMMON_VERSION_MAJOR})
target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MINOR=${DUNE_COMMON_VERSION_MINOR})
target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_REVISION=${DUNE_COMMON_VERSION_REVISION})
foreach(tgt
co2brinepvt
test_2dtables
test_blackoilfluidstate
test_co2brine_ptflash
test_co2brinepvt
test_components
test_densead
test_eclblackoilfluidsystem
test_eclblackoilpvt
test_eclmateriallawmanager
test_EvaluationFormat
test_fluidmatrixinteractions
test_fluidsystems
test_immiscibleflash
test_ncpflash
test_pengrobinson
test_spline
test_tabulation
test_threecomponents_ptflash
)
foreach(src examples/co2brinepvt.cpp ${DUNE_TEST_SOURCE_FILES})
get_filename_component(tgt ${src} NAME_WE)
target_link_libraries(${tgt} dunecommon)
endforeach()

View File

@ -354,43 +354,44 @@ if(ENABLE_ECL_OUTPUT)
endif()
list (APPEND TEST_SOURCE_FILES
tests/test_2dtables.cpp
tests/test_blackoilfluidstate.cpp
tests/test_calculateCellVol.cpp
tests/test_cmp.cpp
tests/test_co2brine_ptflash.cpp
tests/test_components.cpp
tests/test_ConditionalStorage.cpp
tests/test_cubic.cpp
tests/test_messagelimiter.cpp
tests/test_nonuniformtablelinear.cpp
tests/test_OpmInputError_format.cpp
tests/test_OpmLog.cpp
tests/test_param.cpp
tests/test_RootFinders.cpp
tests/test_SegmentMatcher.cpp
tests/test_sparsevector.cpp
tests/test_uniformtablelinear.cpp
)
# tests that need to be linked to dune-common
list(APPEND DUNE_TEST_SOURCE_FILES
tests/test_2dtables.cpp
tests/test_blackoilfluidstate.cpp
tests/test_co2brine_ptflash.cpp
tests/test_components.cpp
tests/test_densead.cpp
tests/test_EvaluationFormat.cpp
tests/test_fluidmatrixinteractions.cpp
tests/test_fluidsystems.cpp
tests/test_immiscibleflash.cpp
tests/test_messagelimiter.cpp
tests/test_ncpflash.cpp
tests/test_nonuniformtablelinear.cpp
tests/test_OpmInputError_format.cpp
tests/test_OpmLog.cpp
tests/test_param.cpp
tests/test_pengrobinson.cpp
tests/test_RootFinders.cpp
tests/test_SegmentMatcher.cpp
tests/test_sparsevector.cpp
tests/test_spline.cpp
tests/test_tabulation.cpp
tests/test_threecomponents_ptflash.cpp
tests/test_uniformtablelinear.cpp
)
if(ENABLE_ECL_INPUT)
list(APPEND TEST_SOURCE_FILES
tests/rst_test.cpp
tests/test_ActiveGridCells.cpp
tests/test_CopyablePtr.cpp
tests/test_co2brinepvt.cpp
tests/test_eclblackoilfluidsystem.cpp
tests/test_eclblackoilpvt.cpp
tests/test_eclmateriallawmanager.cpp
tests/test_ERsm.cpp
tests/test_GuideRate.cpp
tests/test_RestartFileView.cpp
@ -473,6 +474,14 @@ if(ENABLE_ECL_INPUT)
tests/parser/WLIST.cpp
tests/parser/WriteRestartFileEventsTests.cpp
tests/parser/WTEST.cpp)
# tests that needs to be linked to dune-common
list(APPEND DUNE_TEST_SOURCE_FILES
tests/test_co2brinepvt.cpp
tests/test_eclblackoilfluidsystem.cpp
tests/test_eclblackoilpvt.cpp
tests/test_eclmateriallawmanager.cpp
)
endif()
if(ENABLE_ECL_OUTPUT)
list (APPEND TEST_SOURCE_FILES
@ -514,6 +523,8 @@ if(ENABLE_ECL_OUTPUT)
)
endif()
list(APPEND TEST_SOURCE_FILES ${DUNE_TEST_SOURCE_FILES})
list (APPEND TEST_DATA_FILES
tests/testdata.param
)