Sanitize parameter_handler_25 output

diff --git a/tests/parameter_handler/parameter_handler_25.cc b/tests/parameter_handler/parameter_handler_25.cc
index fe093f58aee634abc08e05882d2d636199e1b72d..ee6aa106e3c670472f4efeb681409ead24fb1e1a 100644 (file)
--- a/tests/parameter_handler/parameter_handler_25.cc
+++ b/tests/parameter_handler/parameter_handler_25.cc
@@ -93,7 +93,10 @@ fail()
     }
   catch (const std::exception &exc)
     {
-      deallog << exc.what() << std::endl;
+      std::string error = exc.what();
+      auto        start = error.find("The violated condition was:");
+      if (start != std::string::npos)
+        deallog << error.substr(start) << std::endl;
     }
 
   // check set status
@@ -103,7 +106,10 @@ fail()
     }
   catch (const std::exception &exc)
     {
-      deallog << exc.what() << std::endl;
+      std::string error = exc.what();
+      auto        start = error.find("The violated condition was:");
+      if (start != std::string::npos)
+        deallog << error.substr(start) << std::endl;
     }
 }
 

diff --git a/tests/parameter_handler/parameter_handler_25.output b/tests/parameter_handler/parameter_handler_25.output
index d139d9cf5d720043a938277762956343515ece7f..d1f6e83ac49774e36b4d3c1b0e979b660a0f8763 100644 (file)
--- a/tests/parameter_handler/parameter_handler_25.output
+++ b/tests/parameter_handler/parameter_handler_25.output
@@ -1,21 +1,13 @@
 
 DEAL::
 DEAL::successful
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::set(const std::string &, const std::string &)
-The violated condition was: 
+DEAL::The violated condition was: 
     false
 Additional information: 
     You can't ask for entry <Precison> you have not yet declared.
 --------------------------------------------------------
 
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::assert_that_entries_have_been_set() const
-The violated condition was: 
+DEAL::The violated condition was: 
     entries_wrongly_not_set.empty()
 Additional information: 
     Not all entries of the parameter handler that were declared with

diff --git a/tests/parameter_handler/parameter_handler_25.output.gcc-12 b/tests/parameter_handler/parameter_handler_25.output.gcc-12
deleted file mode 100644 (file)
index 6985ee4..0000000
--- a/tests/parameter_handler/parameter_handler_25.output.gcc-12
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DEAL::
-DEAL::successful
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::set(const std::string&, const std::string&)
-The violated condition was: 
-    false
-Additional information: 
-    You can't ask for entry <Precison> you have not yet declared.
---------------------------------------------------------
-
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::assert_that_entries_have_been_set() const
-The violated condition was: 
-    entries_wrongly_not_set.empty()
-Additional information: 
-    Not all entries of the parameter handler that were declared with
-    `has_to_be_set = true` have been set. The following parameters
-    
-    General.Precision
-    General.dim
-    
-    have not been set. A possible reason might be that you did not add
-    these parameter to the input file or that their spelling is not
-    correct.
---------------------------------------------------------
-

diff --git a/tests/parameter_handler/parameter_handler_25.output.std b/tests/parameter_handler/parameter_handler_25.output.std
deleted file mode 100644 (file)
index d139d9c..0000000
--- a/tests/parameter_handler/parameter_handler_25.output.std
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DEAL::
-DEAL::successful
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::set(const std::string &, const std::string &)
-The violated condition was: 
-    false
-Additional information: 
-    You can't ask for entry <Precison> you have not yet declared.
---------------------------------------------------------
-
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::assert_that_entries_have_been_set() const
-The violated condition was: 
-    entries_wrongly_not_set.empty()
-Additional information: 
-    Not all entries of the parameter handler that were declared with
-    `has_to_be_set = true` have been set. The following parameters
-    
-    General.Precision
-    General.dim
-    
-    have not been set. A possible reason might be that you did not add
-    these parameter to the input file or that their spelling is not
-    correct.
---------------------------------------------------------
-

diff --git a/tests/parameter_handler/parameter_handler_25.output2 b/tests/parameter_handler/parameter_handler_25.output2
deleted file mode 100644 (file)
index 62165e4..0000000
--- a/tests/parameter_handler/parameter_handler_25.output2
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DEAL::
-DEAL::successful
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::set(const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>> &, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>> &)
-The violated condition was: 
-    false
-Additional information: 
-    You can't ask for entry <Precison> you have not yet declared.
---------------------------------------------------------
-
-DEAL::
---------------------------------------------------------
-An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::assert_that_entries_have_been_set() const
-The violated condition was: 
-    entries_wrongly_not_set.empty()
-Additional information: 
-    Not all entries of the parameter handler that were declared with
-    `has_to_be_set = true` have been set. The following parameters
-    
-    General.Precision
-    General.dim
-    
-    have not been set. A possible reason might be that you did not add
-    these parameter to the input file or that their spelling is not
-    correct.
---------------------------------------------------------
-