Fix some tests failing without LAPAPCK support and with -Werror

diff --git a/tests/boost/point_adaptor_01.cc b/tests/boost/point_adaptor_01.cc
index de2f407eca840428d6252b8622c6c24002dc9829..402969359d22ba3f2f954002355466219ef2305f 100644 (file)
--- a/tests/boost/point_adaptor_01.cc
+++ b/tests/boost/point_adaptor_01.cc
@@ -19,6 +19,7 @@
 
 #include <boost/geometry/algorithms/equals.hpp>
 #include <boost/geometry/algorithms/make.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
 
 #include "../tests.h"
 

diff --git a/tests/boost/rtree_02.cc b/tests/boost/rtree_02.cc
index 837f232cef47b34c64e7d19d49d7192716d83d85..3f73309c11afe854f6721e48971e990d68114379 100644 (file)
--- a/tests/boost/rtree_02.cc
+++ b/tests/boost/rtree_02.cc
@@ -26,6 +26,8 @@
 
 #include <deal.II/numerics/rtree.h>
 
+#include <boost/geometry/algorithms/buffer.hpp>
+
 #include "../tests.h"
 
 namespace bgi = boost::geometry::index;
@@ -64,4 +66,4 @@ main()
     else
       deallog << "OK." << std::endl;
   }
-}
\ No newline at end of file
+}

diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output
similarity index 100%
rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output

diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output
similarity index 100%
rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output

diff --git a/tests/cuda/vector_memory_02.output b/tests/cuda/vector_memory_02.debug.output
similarity index 100%
rename from tests/cuda/vector_memory_02.output
rename to tests/cuda/vector_memory_02.debug.output

diff --git a/tests/dofs/dof_test.cc b/tests/dofs/dof_test.cc
index a5a6c417f64e7a15fd8a8958a0dfff7be77f9e29..7d5751e84d1fb2bfc9d7bf906f5072d713dd2ff1 100644 (file)
--- a/tests/dofs/dof_test.cc
+++ b/tests/dofs/dof_test.cc
@@ -157,7 +157,7 @@ CurvedLine<dim>::get_new_point_on_quad(
   // z-value of the midpoint is either
   // 0 or 1, then the z-values of all
   // vertices of the quad is like that
-  if ((middle(2) == 0) || (middle(2) == 1))
+  if (dim == 3 && (middle(dim - 1) == 0) || (middle(dim - 1) == 1))
     return middle;
 
   double x = middle(0), y = middle(1);

diff --git a/tests/grid/grid_generator_open_torus.output b/tests/grid/grid_generator_open_torus.with_lapack=on.output
similarity index 100%
rename from tests/grid/grid_generator_open_torus.output
rename to tests/grid/grid_generator_open_torus.with_lapack=on.output

diff --git a/tests/grid/grid_test.cc b/tests/grid/grid_test.cc
index 64804314302416d8d4a6e83ae3be233c51c6d407..1506bab7ccba48944ad62b0f65f1e74ff3cf3f60 100644 (file)
--- a/tests/grid/grid_test.cc
+++ b/tests/grid/grid_test.cc
@@ -133,7 +133,7 @@ CurvedLine<dim>::get_new_point_on_quad(
   // z-value of the midpoint is either
   // 0 or 1, then the z-values of all
   // vertices of the quad is like that
-  if ((middle(2) == 0) || (middle(2) == 1))
+  if (dim == 3 && (middle(dim - 1) == 0) || (middle(dim - 1) == 1))
     return middle;
 
   double x = middle(0), y = middle(1);

diff --git a/tests/grid/grid_tools_aspect_ratio.output b/tests/grid/grid_tools_aspect_ratio.with_lapack=true.output
similarity index 100%
rename from tests/grid/grid_tools_aspect_ratio.output
rename to tests/grid/grid_tools_aspect_ratio.with_lapack=true.output

diff --git a/tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.output b/tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.with_lapack=true.output
similarity index 100%
rename from tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.output
rename to tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.with_lapack=true.output

diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc
index 843204a5a4ff7bd153c584c39de7106c53b56be6..c7fb6d73844837c3e13da79abfc3579c22dfa785 100644 (file)
--- a/tests/mpi/no_flux_constraints_02.cc
+++ b/tests/mpi/no_flux_constraints_02.cc
@@ -139,7 +139,7 @@ test()
     {
       // sort and merge the constraint matrices on proc 0, generate a checksum
       // and output that into the deallog
-      system(
+      int return_value = system(
         (std::string("cat ") + base + "cm_?.dot|sort -n|uniq >" + base + "cm")
           .c_str());
       {
@@ -150,6 +150,7 @@ test()
         deallog << "checksum: " << checksum(str.begin(), str.end())
                 << std::endl;
       }
+      (void)return_value;
       // delete the file created by processor 0
       std::remove((base + "cm").c_str());
     }

diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc
index 10d6d5c37dcaef7376727d9f50301dd3cc0bc100..1ce610bcc2e48bd3bdd9dff6bb211726fe82bae5 100644 (file)
--- a/tests/mpi/no_flux_constraints_03.cc
+++ b/tests/mpi/no_flux_constraints_03.cc
@@ -113,9 +113,9 @@ test()
     {
       // sort and merge the constraint matrices on proc 0, generate a checksum
       // and output that into the deallog
-      system((std::string("cat ") + base + "cm_*.dot | sort -n | uniq > " +
-              base + "cm")
-               .c_str());
+      int return_value = system((std::string("cat ") + base +
+                                 "cm_*.dot | sort -n | uniq > " + base + "cm")
+                                  .c_str());
       {
         std::ifstream     file((base + "cm").c_str());
         std::stringstream ss;
@@ -124,6 +124,7 @@ test()
         deallog << "checksum: " << checksum(str.begin(), str.end())
                 << std::endl;
       }
+      (void)return_value;
       // delete the file created by processor 0
       std::remove((base + "cm").c_str());
     }

diff --git a/tests/mpi/step-37.with_p4est=true.mpirun=1.output b/tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/step-37.with_p4est=true.mpirun=1.output
rename to tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=1.output

diff --git a/tests/mpi/step-37.with_p4est=true.mpirun=7.output b/tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=7.output
similarity index 100%
rename from tests/mpi/step-37.with_p4est=true.mpirun=7.output
rename to tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=7.output

diff --git a/tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.output b/tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.with_lapack=true.output
similarity index 100%
rename from tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.output
rename to tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.with_lapack=true.output