From 7c9f27898b22ae22c40eec25a3c5a87bca83f3bd Mon Sep 17 00:00:00 2001 From: kronbichler Date: Fri, 31 May 2013 16:01:25 +0000 Subject: [PATCH] Better way for recording the exception: Only print its name, not the full info in order to avoid differences in encoding anonymous namespaces and future changes in function names git-svn-id: https://svn.dealii.org/trunk@29687 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/constraint_matrix_trilinos_bug.cc | 2 +- .../ncpu_10/cmp/generic | 13 +------------ .../ncpu_4/cmp/generic | 13 +------------ 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc index a8c7445d5e..f75280fa80 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -116,7 +116,7 @@ void test() catch (const ExceptionBase &e) { if (myid==0) - deallog << "Exception: " << e.what() << std::endl; + deallog << "Exception: " << e.get_exc_name() << std::endl; throwing=true; } Assert(throwing, ExcInternalError()); diff --git a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic b/tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic index 8de127041a..52e0f2ea1d 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic +++ b/tests/mpi/constraint_matrix_trilinos_bug/ncpu_10/cmp/generic @@ -1,13 +1,2 @@ -DEAL:0:2d::Exception: --------------------------------------------------------- -An error occurred in file in function - void dealii::internal::{anonymous}::import_vector_with_ghost_elements(const dealii::TrilinosWrappers::MPI::Vector&, const dealii::IndexSet&, const dealii::IndexSet&, dealii::TrilinosWrappers::MPI::Vector&, dealii::internal::bool2type) -The violated condition was: - !vec.has_ghost_elements() -The name and call sequence of the exception was: - TrilinosWrappers::VectorBase::ExcGhostsPresent() -Additional Information: -(none) --------------------------------------------------------- - +DEAL:0:2d::Exception: TrilinosWrappers::VectorBase::ExcGhostsPresent() diff --git a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic b/tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic index 8de127041a..52e0f2ea1d 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic +++ b/tests/mpi/constraint_matrix_trilinos_bug/ncpu_4/cmp/generic @@ -1,13 +1,2 @@ -DEAL:0:2d::Exception: --------------------------------------------------------- -An error occurred in file in function - void dealii::internal::{anonymous}::import_vector_with_ghost_elements(const dealii::TrilinosWrappers::MPI::Vector&, const dealii::IndexSet&, const dealii::IndexSet&, dealii::TrilinosWrappers::MPI::Vector&, dealii::internal::bool2type) -The violated condition was: - !vec.has_ghost_elements() -The name and call sequence of the exception was: - TrilinosWrappers::VectorBase::ExcGhostsPresent() -Additional Information: -(none) --------------------------------------------------------- - +DEAL:0:2d::Exception: TrilinosWrappers::VectorBase::ExcGhostsPresent() -- 2.39.5