Skip to content
Snippets Groups Projects
Commit d893b2c1 authored by Robert K's avatar Robert K
Browse files

added proper tests for cmake.

parent 31ece231
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune/fem-dg/test/CMakeLists.txt
+ 1
− 1
View file @ d893b2c1
set(SUBDIRS dataio advdiff euler navierstokes) set(SUBDIRS dataio advdiff euler navierstokes poisson)
# include not needed for CMake # include not needed for CMake
# include $(top_srcdir)/am/global-rules # include $(top_srcdir)/am/global-rules
set(testdir ${CMAKE_INSTALL_INCLUDEDIR}/dune/fem-dg/test) set(testdir ${CMAKE_INSTALL_INCLUDEDIR}/dune/fem-dg/test)
......
dune/fem-dg/test/advdiff/CMakeLists.txt
+ 6
− 14
View file @ d893b2c1
...@@ -4,21 +4,14 @@ set(advdiff_HEADERS models.hh ...@@ -4,21 +4,14 @@ set(advdiff_HEADERS models.hh
problemcreator.hh problemcreator.hh
steppertraits.hh) steppertraits.hh)
#set(LDADD ${ALL_PKG_LDFLAGS} ${ALL_PKG_LIBS} ${LOCAL_LIBS} ${DUNEMPILDFLAGS} ${DUNEMPILIBS})
set(BASEDIR ../../main)
set(GRIDTYPE YASPGRID) set(GRIDTYPE YASPGRID)
set(POLORDER 2) set(POLORDER 2)
set(GRIDDIM 2) set(GRIDDIM 2)
set(DIMRANGE 1) set(DIMRANGE 1)
set(FLUX 1) #2 set(FLUX 1) #2
set(TESTS advdiff set(TESTS advdiff
advdiffonep) advdiffall)
add_definitions( "-D${GRIDTYPE}" ) add_definitions( "-D${GRIDTYPE}" )
add_definitions( "-DGRIDDIM=${GRIDDIM}" ) add_definitions( "-DGRIDDIM=${GRIDDIM}" )
...@@ -27,15 +20,14 @@ add_definitions( "-DFLUX=${FLUX}" ) ...@@ -27,15 +20,14 @@ add_definitions( "-DFLUX=${FLUX}" )
add_definitions( "-DPRIMALDG" ) add_definitions( "-DPRIMALDG" )
add_definitions( "-DUSE_ASSERT_THROW" ) add_definitions( "-DUSE_ASSERT_THROW" )
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/advdiff") include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/advdiff")
add_executable( advdiff ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc ${BASEDIR}/main_2.cc ${BASEDIR}/main_3.cc ) add_executable( advdiffall ${SOURCEALL})
dune_target_link_libraries(advdiff ${DUNE_LIBS}) dune_target_link_libraries(advdiffall ${DUNE_LIBS})
add_executable( advdiffonep ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc ) add_executable( advdiff ${SOURCEONE})
dune_target_link_libraries(advdiffonep ${DUNE_LIBS}) dune_target_link_libraries(advdiff ${DUNE_LIBS})
set_property(TARGET advdiffonep APPEND PROPERTY set_property(TARGET advdiff APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}") COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
# We do not want want to build the tests during make all # We do not want want to build the tests during make all
......
dune/fem-dg/test/euler/CMakeLists.txt
+ 8
− 25
View file @ d893b2c1
...@@ -7,25 +7,14 @@ set(euler_HEADERS eulermodel.hh ...@@ -7,25 +7,14 @@ set(euler_HEADERS eulermodel.hh
chorjo.cc chorjo.cc
passtraits.hh) passtraits.hh)
set(BASEDIR ../../main)
# helper variables
set(SOURCEBASE ${BASEDIR}/main.cc chorjo.cc)
set(SOURCES ${SOURCEBASE} ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc
${BASEDIR}/main_2.cc ${BASEDIR}/main_3.cc)
set(SOURCES12 ${SOURCEBASE} ${BASEDIR}/main_1.cc ${BASEDIR}/main_2.cc)
set(SOURCEONEP ${SOURCEBASE} ${BASEDIR}/main_pol.cc)
set(GRIDTYPE YASPGRID) set(GRIDTYPE YASPGRID)
set(GRIDDIM 2) set(GRIDDIM 2)
set(POLORDER 2)
set(FLUX 1) set(FLUX 1)
set(DIFFFLUXTYPE PRIMALDG) set(DIFFFLUXTYPE PRIMALDG)
set(TESTS euler set(TESTS euler
euler12 eulerall)
euleronep)
add_definitions( "-D${GRIDTYPE}" ) add_definitions( "-D${GRIDTYPE}" )
add_definitions( "-DGRIDDIM=${GRIDDIM}" ) add_definitions( "-DGRIDDIM=${GRIDDIM}" )
...@@ -33,22 +22,16 @@ add_definitions( "-DFLUX=${FLUX}" ) ...@@ -33,22 +22,16 @@ add_definitions( "-DFLUX=${FLUX}" )
add_definitions( "-D${DIFFFLUXTYPE}" ) add_definitions( "-D${DIFFFLUXTYPE}" )
add_definitions( "-DWANT_CACHED_COMM_MANAGER=0" ) add_definitions( "-DWANT_CACHED_COMM_MANAGER=0" )
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/euler") include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/euler")
add_executable( euler ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc ${BASEDIR}/main_2.cc ${BASEDIR}/main_3.cc ) add_executable( eulerall ${SOURCEALL} chorjo.cc )
dune_target_link_libraries(euler ${DUNE_LIBS}) dune_target_link_libraries(eulerall ${DUNE_LIBS})
set_property(TARGET euler APPEND PROPERTY set_property(TARGET eulerall APPEND PROPERTY
COMPILE_DEFINITIONS "LIMITER") COMPILE_DEFINITIONS "LIMITER")
add_executable( euler12 ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc ) add_executable( euler ${SOURCEONE} chorjo.cc )
dune_target_link_libraries(euler12 ${DUNE_LIBS}) dune_target_link_libraries(euler ${DUNE_LIBS})
set_property(TARGET euler12 APPEND PROPERTY set_property(TARGET euler APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_P1_P2")
add_executable( euleronep ${BASEDIR}/main_pol.cc )
dune_target_link_libraries(euleronep ${DUNE_LIBS})
set_property(TARGET euleronep APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}") COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
# We do not want want to build the tests during make all # We do not want want to build the tests during make all
......
dune/fem-dg/test/navierstokes/CMakeLists.txt
+ 10
− 27
View file @ d893b2c1
...@@ -8,15 +8,6 @@ set(nseq_HEADERS ns_model.hh ...@@ -8,15 +8,6 @@ set(nseq_HEADERS ns_model.hh
thermodynamics.hh thermodynamics.hh
passtraits.hh) passtraits.hh)
set(BASEDIR ../../main)
# helper variables
set(SOURCEBASE ${BASEDIR}/main.cc chorjo.cc)
set(SOURCES ${SOURCEBASE} ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc
${BASEDIR}/main_2.cc ${BASEDIR}/main_3.cc)
set(SOURCES12 ${SOURCEBASE} ${BASEDIR}/main_1.cc ${BASEDIR}/main_2.cc)
set(SOURCEONEP ${SOURCEBASE} ${BASEDIR}/main_pol.cc)
set(GRIDTYPE YASPGRID) set(GRIDTYPE YASPGRID)
set(GRIDDIM 3) set(GRIDDIM 3)
set(POLORDER 2) set(POLORDER 2)
...@@ -24,11 +15,8 @@ set(PROBLEM 2) ...@@ -24,11 +15,8 @@ set(PROBLEM 2)
set(FLUX 1) set(FLUX 1)
set(DIFFFLUX PRIMALDG) set(DIFFFLUX PRIMALDG)
set(TESTS nseq set(TESTS navierstokes
nseq12 navierstokesall)
nseqonep)
add_definitions( "-D${GRIDTYPE}" ) add_definitions( "-D${GRIDTYPE}" )
add_definitions( "-DGRIDDIM=${GRIDDIM}" ) add_definitions( "-DGRIDDIM=${GRIDDIM}" )
...@@ -39,21 +27,16 @@ add_definitions( "-DPROBLEM=${PROBLEM}" ) ...@@ -39,21 +27,16 @@ add_definitions( "-DPROBLEM=${PROBLEM}" )
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/navierstokes") include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/navierstokes")
add_executable( nseq ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc ${BASEDIR}/main_2.cc ${BASEDIR}/main_3.cc ) add_executable( navierstokes ${SOURCEONE})
dune_target_link_libraries(nseq ${DUNE_LIBS}) dune_target_link_libraries(navierstokes ${DUNE_LIBS})
set_property(TARGET nseq APPEND PROPERTY set_property(TARGET navierstokes APPEND PROPERTY
COMPILE_DEFINITIONS "LIMITER")
add_executable( nseq12 ${BASEDIR}/main.cc ${BASEDIR}/main_0.cc ${BASEDIR}/main_1.cc )
dune_target_link_libraries(nseq12 ${DUNE_LIBS})
set_property(TARGET nseq12 APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_P1_P2")
add_executable( nseqonep ${BASEDIR}/main_pol.cc )
dune_target_link_libraries(nseqonep ${DUNE_LIBS})
set_property(TARGET nseqonep APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}") COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
add_executable( navierstokesall ${SOURCEALL})
dune_target_link_libraries(navierstokes ${DUNE_LIBS})
set_property(TARGET navierstokesall APPEND PROPERTY
COMPILE_DEFINITIONS "LIMITER")
# We do not want want to build the tests during make all # We do not want want to build the tests during make all
# but just build them on demand # but just build them on demand
install(FILES ${nseq_HEADERS} DESTINATION ${nseqdir}) install(FILES ${nseq_HEADERS} DESTINATION ${nseqdir})
......
dune/fem-dg/test/poisson/CMakeLists.txt 0 → 100644
+ 42
− 0
View file @ d893b2c1
# install these headers
set(poissondir ${CMAKE_INSTALL_INCLUDEDIR}/test/poisson)
set(poisson_HEADERS benchmarkproblems.hh
models.hh
passtraits.hh
problemcreator.hh
poissonproblem.hh )
set(GRIDTYPE YASPGRID)
set(POLORDER 2)
set(GRIDDIM 2)
set(DIMRANGE 1)
set(FLUX 1) #2
set(TESTS poisson
poissonall)
add_definitions( "-D${GRIDTYPE}" )
add_definitions( "-DGRIDDIM=${GRIDDIM}" )
add_definitions( "-DDIMRANGE=${DIMRANGE}" )
add_definitions( "-DFLUX=${FLUX}" )
add_definitions( "-DPRIMALDG" )
add_definitions( "-DUSE_ASSERT_THROW" )
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/poisson")
add_executable( poissonall ${SOURCEALL})
dune_target_link_libraries(poissonall ${DUNE_LIBS})
add_executable( poisson ${SOURCEONE})
dune_target_link_libraries(poisson ${DUNE_LIBS})
set_property(TARGET poisson APPEND PROPERTY
COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
# We do not want want to build the tests during make all
# but just build them on demand
install(FILES ${poisson_HEADERS} DESTINATION ${poissondir})
foreach(i ${TESTS})
add_test(${i} ${i})
endforeach(i ${TESTS})
add_directory_test_target(_test_target)
add_dependencies(${_test_target} ${TESTS} ${COMPILE_XFAIL_TESTS})
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