Merge branch 'feature/improved-cmake-test-skipping' into 'master'

[cmake] Apply the CMAKE_GUARD parameter of dune_add_Test to dune-istl

Except for those parts that do still rely on the enable trick to
test a certain feature set.

See merge request !42

dune/istl/paamg/test/CMakeLists.txt

@@ -15,21 +15,22 @@ if(CMAKE_USE_PTHREADS_INIT)
   target_link_libraries(pthreadtwoleveltest ${CMAKE_THREAD_LIBS_INIT} ${DUNE_LIBS})
   dune_add_test(TARGET pthreadtwoleveltest)
 
-  if(SUPERLU_FOUND OR SuiteSparse_UMFPACK_FOUND)
-    dune_add_test(NAME pthreaddirectamgtest
-                  SOURCES pthreadamgtest.cc
-                  COMPILE_DEFINITIONS MYAMG=Dune::Amg::AMG<Operator,Vector,Smoother>
-                  LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-
-    dune_add_test(NAME pthreaddirectfastamgtest
-                  SOURCES pthreadamgtest.cc
-                  COMPILE_DEFINITIONS MYAMG=Dune::Amg::FastAMG<Operator,Vector>
-                  LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-
-    dune_add_test(NAME pthreaddirecttwoleveltest
-                  SOURCES pthreadtwoleveltest.cc
-                  LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-  endif()
+  dune_add_test(NAME pthreaddirectamgtest
+                SOURCES pthreadamgtest.cc
+                COMPILE_DEFINITIONS MYAMG=Dune::Amg::AMG<Operator,Vector,Smoother>
+                LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
+                CMAKE_GUARD "SUPERLU_FOUND OR SuiteSparse_UMFPACK_FOUND")
+
+  dune_add_test(NAME pthreaddirectfastamgtest
+                SOURCES pthreadamgtest.cc
+                COMPILE_DEFINITIONS MYAMG=Dune::Amg::FastAMG<Operator,Vector>
+                LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
+                CMAKE_GUARD "SUPERLU_FOUND OR SuiteSparse_UMFPACK_FOUND")
+
+  dune_add_test(NAME pthreaddirecttwoleveltest
+                SOURCES pthreadtwoleveltest.cc
+                LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
+                CMAKE_GUARD "SUPERLU_FOUND OR SuiteSparse_UMFPACK_FOUND")
 endif()
 
 # add an executable without SuperLU/UMFPack
@@ -53,14 +54,13 @@ if(SUPERLU_FOUND)
   dune_add_test(TARGET superlufastamgtest)
 endif()
 
-if(SuiteSparse_UMFPACK_FOUND)
-  dune_add_test(NAME umfpackamgtest
-                SOURCES amgtest.cc)
-
-  dune_add_test(NAME umfpackfastamgtest
-                SOURCES fastamg.cc)
-endif()
+dune_add_test(NAME umfpackamgtest
+              SOURCES amgtest.cc
+              CMAKE_GUARD SuiteSparse_UMFPACK_FOUND)
 
+dune_add_test(NAME umfpackfastamgtest
+              SOURCES fastamg.cc
+              CMAKE_GUARD SuiteSparse_UMFPACK_FOUND)
 
 dune_add_test(SOURCES twolevelmethodtest.cc)
 
@@ -75,15 +75,17 @@ dune_add_test(NAME twolevelmethodschwarztest
               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 galerkintest.cc
+              CMAKE_GUARD MPI_FOUND)
 
-  dune_add_test(SOURCES hierarchytest.cc)
+dune_add_test(SOURCES hierarchytest.cc
+              CMAKE_GUARD MPI_FOUND)
 
-  dune_add_test(NAME pamgtest
-                SOURCES parallelamgtest.cc)
+dune_add_test(NAME pamgtest
+              SOURCES parallelamgtest.cc
+              CMAKE_GUARD MPI_FOUND)
 
-  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
+dune_add_test(NAME pamg_comm_repart_test
+              SOURCES parallelamgtest.cc
+              COMPILE_DEFINITIONS -DAMG_REPART_ON_COMM_GRAPH
+              CMAKE_GUARD MPI_FOUND)

dune/istl/test/CMakeLists.txt

@@ -45,55 +45,45 @@ dune_add_test(SOURCES inverseoperator2prectest.cc)
 
 dune_add_test(SOURCES scaledidmatrixtest.cc)
 
-dune_add_test(SOURCES solveraborttest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES solveraborttest.cc)
 
 # Pardiso tests
-dune_add_test(SOURCES test_pardiso.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES test_pardiso.cc)
 
 # SuperLU tests
 dune_add_test(NAME superlustest
               SOURCES superlutest.cc
-              COMPILE_DEFINITIONS SUPERLU_NTYPE=0
-              SKIP_ON_77)
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=0)
 
-dune_add_test(SOURCES superlutest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES superlutest.cc)
 
 dune_add_test(NAME superluctest
               SOURCES superlutest.cc
-              COMPILE_DEFINITIONS SUPERLU_NTYPE=2
-              SKIP_ON_77)
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=2)
 
 dune_add_test(NAME superluztest
               SOURCES superlutest.cc
-              COMPILE_DEFINITIONS SUPERLU_NTYPE=3
-              SKIP_ON_77)
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=3)
 
 dune_add_test(SOURCES complexrhstest.cc
               COMPILE_DEFINITIONS SUPERLU_NTYPE=3)
 
 # SuiteSparse tests
-dune_add_test(SOURCES umfpacktest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES umfpacktest.cc)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "umfpack_decomp")
 
-dune_add_test(SOURCES ldltest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES ldltest.cc)
 
-dune_add_test(SOURCES spqrtest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES spqrtest.cc)
 
-dune_add_test(SOURCES overlappingschwarztest.cc
-              SKIP_ON_77)
+dune_add_test(SOURCES overlappingschwarztest.cc)
 
 # MPI tests
-if(MPI_FOUND)
-  dune_add_test(SOURCES matrixredisttest.cc)
+dune_add_test(SOURCES matrixredisttest.cc
+              CMAKE_GUARD MPI_FOUND)
 
-  dune_add_test(SOURCES vectorcommtest.cc)
-endif()
+dune_add_test(SOURCES vectorcommtest.cc
+              CMAKE_GUARD MPI_FOUND)
 
 dune_add_test(SOURCES matrixmarkettest.cc)