Skip to content
Snippets Groups Projects
Commit 05b545c3 authored by Lisa Julia Nebel's avatar Lisa Julia Nebel
Browse files

Pull the 2.7 branches of all modules when running the CI-tests for dune-2.7

parent 39616a6b
No related branches found
No related tags found
1 merge request!81Fix error in surfacecosseratenergy
......@@ -29,6 +29,8 @@ before_script: &before
EOT
dune:2.7 gcc:
variables:
DUNECI_BRANCH: releases/2.7
image: registry.dune-project.org/docker/ci/dune:2.7-debian-10-gcc-8-17
before_script:
- *patch-dune-common
......
set(programs compute-disc-error
cosserat-continuum
gradient-flow
harmonicmaps
rod3d)
harmonicmaps)
# rodobstacle)
if (${DUNE_COMMON_VERSION} VERSION_GREATER_EQUAL 2.8)
set (programs rod3d ${programs})
endif()
if (${DUNE_ELASTICITY_VERSION} VERSION_GREATER_EQUAL 2.8)
set(programs film-on-substrate-stress-plot ${programs})
endif()
......
......@@ -3,7 +3,6 @@ set(TESTS
averagedistanceassemblertest
cosseratenergytest
cosseratrodenergytest
cosseratrodtest
harmonicenergytest
localgeodesicfefunctiontest
localgfetestfunctiontest
......@@ -11,11 +10,18 @@ set(TESTS
orthogonalmatrixtest
rigidbodymotiontest
rotationtest
surfacecosseratstressassemblertest
svdtest
targetspacetest
)
if (${DUNE_COMMON_VERSION} VERSION_GREATER_EQUAL 2.8)
set(TESTS cosseratrodtest ${TESTS})
endif()
if (${DUNE_COMMON_VERSION} VERSION_GREATER_EQUAL 2.8)
set(TESTS surfacecosseratstressassemblertest ${TESTS})
endif()
if(dune-foamgrid_FOUND)
set(TESTS nonplanarcosseratenergytest ${TESTS})
endif()
......@@ -26,10 +32,12 @@ foreach(_test ${TESTS})
endforeach()
# Run distributed tests
if (${DUNE_COMMON_VERSION} VERSION_GREATER_EQUAL 2.8)
dune_add_test(SOURCES harmonicmaptest.cc
MPI_RANKS 1 4
TIMEOUT 600
CMAKE_GUARD MPI_FOUND)
endif()
dune_add_test(SOURCES geodesicfeassemblerwrappertest.cc
MPI_RANKS 1 4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment