From e660ae302f8d909affe2e85937e13ef9e0f830e2 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Mon, 21 Mar 2016 11:13:28 +0100
Subject: [PATCH] [cmake][bugfix] Fix the testsuite for sequential builds
Some tests assume MPI being present, although they are not executed
in parallel. This information got lost in the transition to dune_add_test
and is restored with this patch. Thanks to @markus.blatt for noticing.
---
dune/istl/paamg/test/CMakeLists.txt | 24 +++++++++++++++---------
dune/istl/test/CMakeLists.txt | 6 ++++--
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/dune/istl/paamg/test/CMakeLists.txt b/dune/istl/paamg/test/CMakeLists.txt
index 01c56f8f1..2146a45c5 100644
--- a/dune/istl/paamg/test/CMakeLists.txt
+++ b/dune/istl/paamg/test/CMakeLists.txt
@@ -64,20 +64,26 @@ endif()
dune_add_test(SOURCES twolevelmethodtest.cc)
-dune_add_test(SOURCES galerkintest.cc)
dune_add_test(SOURCES graphtest.cc)
-dune_add_test(SOURCES hierarchytest.cc)
-dune_add_test(SOURCES kamgtest.cc)
-
-dune_add_test(NAME pamg_comm_repart_test
- SOURCES parallelamgtest.cc
- COMPILE_DEFINITIONS -DAMG_REPART_ON_COMM_GRAPH)
-dune_add_test(NAME pamgtest
- SOURCES parallelamgtest.cc)
+dune_add_test(SOURCES kamgtest.cc)
dune_add_test(SOURCES transfertest.cc)
dune_add_test(NAME twolevelmethodschwarztest
SOURCES twolevelmethodtest.cc
COMPILE_DEFINITIONS USE_OVERLAPPINGSCHWARZ)
+
+# These tests need MPI, even though they are only run sequentially
+if(MPI_FOUND)
+ dune_add_test(SOURCES galerkintest.cc)
+
+ dune_add_test(SOURCES hierarchytest.cc)
+
+ dune_add_test(NAME pamgtest
+ SOURCES parallelamgtest.cc)
+
+ dune_add_test(NAME pamg_comm_repart_test
+ SOURCES parallelamgtest.cc
+ COMPILE_DEFINITIONS -DAMG_REPART_ON_COMM_GRAPH)
+endif()
\ No newline at end of file
diff --git a/dune/istl/test/CMakeLists.txt b/dune/istl/test/CMakeLists.txt
index 0a998ea23..b21cec068 100644
--- a/dune/istl/test/CMakeLists.txt
+++ b/dune/istl/test/CMakeLists.txt
@@ -86,9 +86,11 @@ dune_add_test(SOURCES overlappingschwarztest.cc
SKIP_ON_77)
# MPI tests
-dune_add_test(SOURCES matrixredisttest.cc)
+if(MPI_FOUND)
+ dune_add_test(SOURCES matrixredisttest.cc)
-dune_add_test(SOURCES vectorcommtest.cc)
+ dune_add_test(SOURCES vectorcommtest.cc)
+endif()
dune_add_test(SOURCES matrixmarkettest.cc)
--
GitLab