Merge branch 'feature/FS1538-cmake-skipped-tests'

dune/common/parallel/test/CMakeLists.txt

@@ -30,3 +30,10 @@ add_test(selectiontest selectiontest)
 add_test(indicestest indicestest)
 add_test(syncertest syncertest)
 add_test(variablesizecommunicatortest variablesizecommunicatortest)
+
+# treat tests returning code 77 as skipped
+set_tests_properties(
+  indicestest
+  syncertest
+  variablesizecommunicatortest
+  PROPERTIES SKIP_RETURN_CODE 77)

dune/common/test/CMakeLists.txt

@@ -79,9 +79,7 @@ add_executable("dynvectortest" dynvectortest.cc)
 
 add_executable("eigenvaluestest" eigenvaluestest.cc)
 target_link_libraries(eigenvaluestest dunecommon)
-if(LAPACK_FOUND)
-  target_link_libraries(eigenvaluestest ${LAPACK_LIBRARIES})
-endif(LAPACK_FOUND)
+target_link_libraries(eigenvaluestest ${LAPACK_LIBRARIES})
 
 add_executable("diagonalmatrixtest" diagonalmatrixtest.cc)
 target_link_libraries("diagonalmatrixtest" "dunecommon")
@@ -170,7 +168,13 @@ foreach(_TEST ${TESTPROGS})
   add_test(${_TEST} ${_TEST})
 endforeach(_TEST)
 
-#Set properties for failing tests
+# treat tests returning code 77 as skipped
+set_tests_properties(
+  eigenvaluestest
+  mpicollectivecommunication
+  PROPERTIES SKIP_RETURN_CODE 77)
+
+# set properties for failing tests
 set_tests_properties(
   ${FAILTESTS}
   PROPERTIES WILL_FAIL true)
@@ -183,5 +187,3 @@ endforeach(_TEST)
 set_tests_properties(
   ${COMPILEFAILTESTS}
   PROPERTIES WILL_FAIL true)
-
-

dune/common/test/eigenvaluestest.cc

@@ -14,6 +14,7 @@
 
 using namespace Dune;
 
+#if HAVE_LAPACK
 /** \brief Test the eigenvalue code with the Rosser test matrix
 
    This matrix was a challenge for many matrix eigenvalue
@@ -124,14 +125,20 @@ void testSymmetricFieldMatrix()
         DUNE_THROW(MathError, "Values computed by FMatrixHelp::eigenValues are not in ascending order");
   }
 }
+#endif // HAVE_LAPACK
 
 int main() try
 {
+#if HAVE_LAPACK
   testRosserMatrix<double>();
 
   testSymmetricFieldMatrix<double>();
 
   return 0;
+#else
+  std::cout << "WARNING: eigenvaluetest needs LAPACK, test disabled" << std::endl;
+  return 77;
+#endif // HAVE_LAPACK
 } catch (Exception exception)
 {
   std::cerr << exception << std::endl;