From cb283b9890f8ee28bf6120832b5ed713411d8830 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 30 Nov 2015 19:38:17 +0100
Subject: [PATCH] Tests: Leave exceptions uncaught

Thereby bringing the tests in line with dune-fufem. The current logic of
printing a message and exciting with failure (albeit only for exceptions
of type Dune::Exception) is what happens by default anyway (but for more
general exceptions)
---
 dune/solvers/test/cgsteptest.cc               | 6 +-----
 dune/solvers/test/genericvectortoolstest.cc   | 6 +-----
 dune/solvers/test/lowrankoperatortest.cc      | 8 +-------
 dune/solvers/test/mmgtest.cc                  | 6 +-----
 dune/solvers/test/multigridtest.cc            | 6 +-----
 dune/solvers/test/nulloperatortest.cc         | 6 +-----
 dune/solvers/test/obstacletnnmgtest.cc        | 6 +-----
 dune/solvers/test/projectedgradienttest.cc    | 6 +-----
 dune/solvers/test/quadraticipoptsolvertest.cc | 6 +-----
 dune/solvers/test/sumoperatortest.cc          | 6 +-----
 dune/solvers/test/umfpacksolvertest.cc        | 7 +------
 11 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/dune/solvers/test/cgsteptest.cc b/dune/solvers/test/cgsteptest.cc
index d78da6d..6386cfe 100644
--- a/dune/solvers/test/cgsteptest.cc
+++ b/dune/solvers/test/cgsteptest.cc
@@ -170,7 +170,7 @@ struct CGTestSuite
     }
 };
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -180,7 +180,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/genericvectortoolstest.cc b/dune/solvers/test/genericvectortoolstest.cc
index bba5a0d..151c14a 100644
--- a/dune/solvers/test/genericvectortoolstest.cc
+++ b/dune/solvers/test/genericvectortoolstest.cc
@@ -53,7 +53,7 @@ bool check()
     return passed;
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -73,7 +73,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/lowrankoperatortest.cc b/dune/solvers/test/lowrankoperatortest.cc
index 7b869a5..a500aa0 100644
--- a/dune/solvers/test/lowrankoperatortest.cc
+++ b/dune/solvers/test/lowrankoperatortest.cc
@@ -180,7 +180,7 @@ bool check()
     return passed;
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
 //    static const int block_size = BLOCKSIZE;
 
@@ -198,9 +198,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
-
diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc
index d63e89c..f4705be 100644
--- a/dune/solvers/test/mmgtest.cc
+++ b/dune/solvers/test/mmgtest.cc
@@ -174,7 +174,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -197,7 +197,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/multigridtest.cc b/dune/solvers/test/multigridtest.cc
index 9ab2acd..2a1ebdd 100644
--- a/dune/solvers/test/multigridtest.cc
+++ b/dune/solvers/test/multigridtest.cc
@@ -174,7 +174,7 @@ struct MultigridTestSuite
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -188,7 +188,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/nulloperatortest.cc b/dune/solvers/test/nulloperatortest.cc
index aa8589c..9391893 100644
--- a/dune/solvers/test/nulloperatortest.cc
+++ b/dune/solvers/test/nulloperatortest.cc
@@ -84,7 +84,7 @@ bool check()
     return true;
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
 
@@ -98,7 +98,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/obstacletnnmgtest.cc b/dune/solvers/test/obstacletnnmgtest.cc
index 4d68665..373c0da 100644
--- a/dune/solvers/test/obstacletnnmgtest.cc
+++ b/dune/solvers/test/obstacletnnmgtest.cc
@@ -174,7 +174,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -197,7 +197,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/projectedgradienttest.cc b/dune/solvers/test/projectedgradienttest.cc
index 8c55143..ebd0def 100644
--- a/dune/solvers/test/projectedgradienttest.cc
+++ b/dune/solvers/test/projectedgradienttest.cc
@@ -141,7 +141,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName, int maxIterations
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -168,7 +168,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/quadraticipoptsolvertest.cc b/dune/solvers/test/quadraticipoptsolvertest.cc
index 1ec6610..a681039 100644
--- a/dune/solvers/test/quadraticipoptsolvertest.cc
+++ b/dune/solvers/test/quadraticipoptsolvertest.cc
@@ -152,7 +152,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
     bool passed(true);
@@ -175,7 +175,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/sumoperatortest.cc b/dune/solvers/test/sumoperatortest.cc
index b088887..39d0570 100644
--- a/dune/solvers/test/sumoperatortest.cc
+++ b/dune/solvers/test/sumoperatortest.cc
@@ -170,7 +170,7 @@ bool check()
     return passed;
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
 
@@ -196,7 +196,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
diff --git a/dune/solvers/test/umfpacksolvertest.cc b/dune/solvers/test/umfpacksolvertest.cc
index 79b145d..cc69e11 100644
--- a/dune/solvers/test/umfpacksolvertest.cc
+++ b/dune/solvers/test/umfpacksolvertest.cc
@@ -101,7 +101,7 @@ struct UMFPackSolverTestSuite
 
 
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     Dune::MPIHelper::instance(argc, argv);
 
@@ -114,8 +114,3 @@ int main(int argc, char** argv) try
 
     return passed ? 0 : 1;
 }
-catch (Dune::Exception e) {
-    std::cout << e << std::endl;
-    return 1;
-}
-
-- 
GitLab