Merge branch 'feature/FS-1538-build-and-mark-skipped-tests' into 'master'

Feature/fs 1538 build and mark skipped tests

The remaining conditional builds are kept because they are used to build tests multiple times, with or without SuperLU, ARPACKPP or UPFPack.

See merge request !21

dune/istl/eigenvalue/test/CMakeLists.txt

@@ -7,14 +7,14 @@ if(SUPERLU_FOUND)
   add_dune_superlu_flags(poweriterationsuperlutest)
   dune_add_test(TARGET poweriterationsuperlutest)
   target_link_libraries(poweriterationsuperlutest dunecommon)
-endif(SUPERLU_FOUND)
+endif()
 
 if(ARPACKPP_FOUND)
   add_executable(arpackpptest cond2test.cc)
   add_dune_arpackpp_flags(arpackpptest)
   target_link_libraries(arpackpptest dunecommon)
   dune_add_test(TARGET arpackpptest)
-endif(ARPACKPP_FOUND)
+endif()
 
 if(ARPACKPP_FOUND AND SUPERLU_FOUND)
   dune_add_test(NAME arpackppsuperlutest

dune/istl/eigenvalue/test/cond2test.cc

-#include "config.h"
+#include <config.h>
 
 #include <iostream>
 
@@ -52,15 +52,9 @@ int main (int argc, char** argv)
 
     return 0;
   }
-  catch (Dune::Exception& e)
-  {
-    std::cerr << "Dune reported error: " << e << std::endl;
-    return 1;
-  }
   catch (std::exception& e)
   {
-    std::cerr << "Standard library reported error: " << e.what() << std::endl;
-    return 1;
+    throw;
   }
   catch (...)
   {

dune/istl/paamg/test/CMakeLists.txt

@@ -51,7 +51,7 @@ if(SUPERLU_FOUND)
   add_dune_superlu_flags(superlufastamgtest)
   target_link_libraries(superlufastamgtest ${DUNE_LIBS})
   dune_add_test(TARGET superlufastamgtest)
-endif(SUPERLU_FOUND)
+endif()
 
 if(SuiteSparse_UMFPACK_FOUND)
   dune_add_test(NAME umfpackamgtest

dune/istl/pardiso.hh

@@ -6,7 +6,7 @@
 #include <dune/istl/preconditioners.hh>
 #include <dune/istl/solvertype.hh>
 
-#ifdef HAVE_PARDISO
+#if HAVE_PARDISO
 // PARDISO prototypes
 extern "C" void pardisoinit(void *, int *, int *, int *, double *, int *);
 

dune/istl/test/CMakeLists.txt

@@ -39,52 +39,51 @@ dune_add_test(SOURCES inverseoperator2prectest.cc)
 
 dune_add_test(SOURCES scaledidmatrixtest.cc)
 
-if(HAVE_PARDISO)
-  dune_add_test(SOURCES test_pardiso.cc)
-endif(HAVE_PARDISO)
+# Pardiso tests
+dune_add_test(SOURCES test_pardiso.cc
+              SKIP_ON_77)
 
-if(SUPERLU_FOUND)
-  dune_add_test(NAME superlustest
-                SOURCES superlutest.cc
-                COMPILE_DEFINITIONS SUPERLU_NTYPE=0)
+# SuperLU tests
+dune_add_test(NAME superlustest
+              SOURCES superlutest.cc
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=0
+              SKIP_ON_77)
 
-  dune_add_test(SOURCES superlutest.cc)
+dune_add_test(SOURCES superlutest.cc
+              SKIP_ON_77)
 
-  dune_add_test(NAME superluctest
-                SOURCES superlutest.cc
-                COMPILE_DEFINITIONS SUPERLU_NTYPE=2)
+dune_add_test(NAME superluctest
+              SOURCES superlutest.cc
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=2
+              SKIP_ON_77)
 
-  dune_add_test(NAME superluztest
-                SOURCES superlutest.cc
-                COMPILE_DEFINITIONS SUPERLU_NTYPE=3)
+dune_add_test(NAME superluztest
+              SOURCES superlutest.cc
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=3
+              SKIP_ON_77)
 
-  dune_add_test(SOURCES complexrhstest.cc
-                COMPILE_DEFINITIONS SUPERLU_NTYPE=3)
-endif()
+dune_add_test(SOURCES complexrhstest.cc
+              COMPILE_DEFINITIONS SUPERLU_NTYPE=3)
 
-if(SuiteSparse_UMFPACK_FOUND)
-  dune_add_test(SOURCES umfpacktest.cc)
-  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "umfpack_decomp")
-endif()
+# SuiteSparse tests
+dune_add_test(SOURCES umfpacktest.cc
+              SKIP_ON_77)
+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
+              SKIP_ON_77)
 
-dune_add_test(
-  SOURCES spqrtest.cc
-  SKIP_ON_77)
+dune_add_test(SOURCES spqrtest.cc
+              SKIP_ON_77)
 
-if ((SUPERLU_FOUND) OR (SuiteSparse_UMFPACK_FOUND))
-  dune_add_test(SOURCES overlappingschwarztest.cc)
-endif()
+dune_add_test(SOURCES overlappingschwarztest.cc
+              SKIP_ON_77)
 
-if(HAVE_MPI)
-  dune_add_test(SOURCES matrixredisttest.cc)
+# MPI tests
+dune_add_test(SOURCES matrixredisttest.cc)
 
-  dune_add_test(SOURCES vectorcommtest.cc)
+dune_add_test(SOURCES vectorcommtest.cc)
 
-  dune_add_test(SOURCES matrixmarkettest.cc)
-endif(HAVE_MPI)
+dune_add_test(SOURCES matrixmarkettest.cc)
 
 exclude_from_headercheck(complexdata.hh)

dune/istl/test/complexrhstest.cc

@@ -7,10 +7,8 @@
  *        \f$A*x = b\f$ with \f$A\f$ being a \f$N^2 \times N^2\f$
  *        Laplacian and \f$b\f$ a complex valued rhs.
  */
+#include <config.h>
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include <complex>
 
 #include <dune/istl/bvector.hh>
@@ -188,6 +186,8 @@ int main(int argc, char** argv)
 #if HAVE_SUPERLU
   Dune::SuperLU<BCRSMat> solverSuperLU(mat, true);
   std::cout << "SuperLU converged:  "<< solverTest(solverSuperLU) << std::endl <<  std::endl;
+#else
+  std::cout << "SuperLU skipped because not found." << std::endl <<  std::endl;
 #endif
 
   typedef  Dune::GradientSolver<Vector> GradientSolver;

dune/istl/test/overlappingschwarztest.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include "config.h"
+#include <config.h>
+
 #include <dune/istl/io.hh>
 #include <dune/istl/bvector.hh>
 #include <dune/istl/operators.hh>
@@ -18,7 +19,7 @@
 
 int main(int argc, char** argv)
 {
-
+#if HAVE_SUPERLU || HAVE_SUITESPARSE_UMFPACK
   const int BS=1;
   int N=4;
 
@@ -235,4 +236,10 @@ int main(int argc, char** argv)
   Dune::SeqSOR<BCRSMat,BVector,BVector> sor(mat, 1,1);
   Dune::LoopSolver<BVector> solver4(fop, sor, 1e-2,100,2);
   solver4.apply(x,b, res);
+
+  return 0;
+#else // HAVE_SUPERLU || HAVE_SUITESPARSE_UMFPACK
+  std::cerr << "You need SuperLU or SuiteSparse's UMFPack to run this test." << std::endl;
+  return 77;
+#endif // HAVE_SUPERLU || HAVE_SUITESPARSE_UMFPACK
 }

dune/istl/test/superlutest.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include "config.h"
+#include <config.h>
 
 #include <complex>
 
@@ -37,6 +37,7 @@ typedef std::complex<double> FIELD_TYPE;
 int main(int argc, char** argv)
 try
 {
+#if HAVE_SUPERLU
   const int BS=1;
   std::size_t N=100;
 
@@ -84,6 +85,10 @@ try
   solver1.apply(reinterpret_cast<FIELD_TYPE*>(&x1[0]), reinterpret_cast<FIELD_TYPE*>(&b1[0]));
 
   return 0;
+#else // HAVE_SUPERLU
+  std::cerr << "You need SuperLU to run this test." << std::endl;
+  return 77;
+#endif // HAVE_SUPERLU
 }
 catch (std::exception &e)
 {

dune/istl/test/test_pardiso.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <config.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
-#include "config.h"
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/io.hh>
 #include <dune/istl/operators.hh>
@@ -13,6 +14,7 @@
 
 int main(int argc, char** argv)
 {
+#if HAVE_PARDISO
   try
   {
     /* Matrix data. */
@@ -186,10 +188,15 @@ int main(int argc, char** argv)
 
     return 0;
   }
-  catch (Dune::Exception &e) {
-    std::cerr << "Dune reported error: " << e << std::endl;
+  catch (std::exception &e)
+  {
+    throw;
   }
   catch (...) {
     std::cerr << "Unknown exception thrown!" << std::endl;
   }
+#else // HAVE_PARDISO
+  std::cerr << "You need Pardiso to run this test." << std::endl;
+  return 77;
+#endif // HAVE_PARDISO
 }

dune/istl/test/umfpacktest.cc

-#include "config.h"
+#include <config.h>
 
 #include <complex>
-#include<iostream>
+#include <iostream>
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
@@ -17,6 +17,7 @@
 
 int main(int argc, char** argv)
 {
+#if HAVE_SUITESPARSE_UMFPACK
   try
   {
     typedef double FIELD_TYPE;
@@ -81,4 +82,8 @@ int main(int argc, char** argv)
     std::cerr << "Dune reported an unknown error." << std::endl;
     exit(1);
   }
+#else // HAVE_SUITESPARSE_UMFPACK
+  std::cerr << "You need SuiteSparse's UMFPack to run this test." << std::endl;
+  return 77;
+#endif // HAVE_SUITESPARSE_UMFPACK
 }