fix flaky trilinos/solver_control_06

Reading from the stdout file generated by the test runner seems to occasionally fail in parallel. Maybe it is okay to not check the output in that case...

diff --git a/tests/trilinos/solver_control_06.cc b/tests/trilinos/solver_control_06.cc
index 39f3288e2bd7d86f1df346bdf1feba303f6bc9dd..d06fc9b425ddef674d3e4b72893b89068c21f503 100644 (file)
--- a/tests/trilinos/solver_control_06.cc
+++ b/tests/trilinos/solver_control_06.cc
@@ -515,18 +515,22 @@ main(int argc, char *argv[])
   // We catch this output and it is written to the stdout logfile
   // Since we're interested in this output we read it back in and
   // write parts of it to the logstream
-  std::ifstream inputfile;
-  inputfile.open("stdout");
-  Assert(inputfile.good() && inputfile.is_open(), ExcIO());
-  std::string       line;
-  const std::string key = "*****";
-  while (std::getline(inputfile, line))
+  // We can only do this reliably if we are not running in parallel (sometimes
+  // stdout is not written yet otherwise)
+  if (Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD) == 1)
     {
-      if (line.find(key) != std::string::npos)
-        deallog << line << std::endl;
+      std::ifstream inputfile;
+      inputfile.open("stdout");
+      Assert(inputfile.good() && inputfile.is_open(), ExcIO());
+      std::string       line;
+      const std::string key = "*****";
+      while (std::getline(inputfile, line))
+        {
+          if (line.find(key) != std::string::npos)
+            deallog << line << std::endl;
+        }
+      inputfile.close();
     }
-  inputfile.close();
-
   deallog << "OK" << std::endl;
 
   return 0;

diff --git a/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output b/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output
index a9367599f63755201e53241f582dc31a4d69851d..3d417835ae2f326585704776bbf8dde76d57558b 100644 (file)
--- a/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output
+++ b/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output
@@ -11,76 +11,4 @@ DEAL::Convergence step 7 value 1.94830e-14
 DEAL::Convergence step 12 value 8.42698e-13
 DEAL::Convergence step 7 value 5.55656e-13
 DEAL::Convergence step 7 value 2.07782e-14
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CGS solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned GMRES solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned BICGSTAB solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned TFQMR solution
-DEAL::         ***** ML (L=1, ~/Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CGS solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned GMRES solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned BICGSTAB solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned TFQMR solution
-DEAL::         ***** ML (L=2, Cheby_pre0/Cheby_post0, ~/Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
 DEAL::OK

diff --git a/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output.3 b/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output.3
index c09bef5c9e2efdbd6308013729ef119ebb8dac19..f7205b1a19b1f5e15154463105adf9f9afec2895 100644 (file)
--- a/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output.3
+++ b/tests/trilinos/solver_control_06.with_p4est=true.mpirun=2.output.3
@@ -11,76 +11,4 @@ DEAL::Convergence step 7 value 1.94823e-14
 DEAL::Convergence step 12 value 8.42698e-13
 DEAL::Convergence step 7 value 5.55661e-13
 DEAL::Convergence step 7 value 2.07636e-14
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CGS solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned GMRES solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned BICGSTAB solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned TFQMR solution
-DEAL::         ***** ML (L=1, /Amesos_KLU_0, )
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CG solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned CGS solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned GMRES solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned BICGSTAB solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
-DEAL::         *******************************************************
-DEAL::         ***** Problem: Epetra::CrsMatrix
-DEAL::         ***** Preconditioned TFQMR solution
-DEAL::         ***** ML (L=2, /Cheby_post0, /Amesos_KLU_1)
-DEAL::         ***** No scaling
-DEAL::         *******************************************************
 DEAL::OK