From 5d2ad8b22c835824a2b68ab129ff9152c44603c2 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 15 Feb 2013 22:32:12 +0000 Subject: [PATCH] fix tests (throw in assert change) git-svn-id: https://svn.dealii.org/trunk@28413 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/deal.II/user_data_01.cc | 17 +++++++++++++++-- tests/deal.II/user_data_01/cmp/generic | 4 ---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/deal.II/user_data_01.cc b/tests/deal.II/user_data_01.cc index cd305ce6c3..c334786c9b 100644 --- a/tests/deal.II/user_data_01.cc +++ b/tests/deal.II/user_data_01.cc @@ -168,7 +168,13 @@ user_pointers(Triangulation& tr) // Check if they are still the same check_user_pointers(tr); // Create two pointer index clashes here - tr.begin()->user_index(); + try + { + tr.begin()->user_index(); + } + catch (...) + { + } tr.begin()->user_pointer(); @@ -239,8 +245,15 @@ user_indices(Triangulation& tr) // Check if they are still the same check_user_indices(tr); // Create two pointer index clashes here - tr.begin()->user_pointer(); + try + { + tr.begin()->user_pointer(); + } + catch (...) + { + } tr.begin()->user_index(); + // Check if save and load work diff --git a/tests/deal.II/user_data_01/cmp/generic b/tests/deal.II/user_data_01/cmp/generic index b870bcedca..ddcba3194a 100644 --- a/tests/deal.II/user_data_01/cmp/generic +++ b/tests/deal.II/user_data_01/cmp/generic @@ -4,7 +4,6 @@ DEAL::.....................cells DEAL::........................................................faces DEAL::lines DEAL::ExcPointerIndexClash() -DEAL::ExcPointerIndexClash() DEAL::Save2D DEAL::Load2D DEAL::.....................cells @@ -15,7 +14,6 @@ DEAL::.....................cells DEAL::........................................................faces DEAL::lines DEAL::ExcPointerIndexClash() -DEAL::ExcPointerIndexClash() DEAL::Save2D DEAL::Load2D DEAL::.....................cells @@ -26,7 +24,6 @@ DEAL::.........................................................................c DEAL::..........................................................................................................................................................................................................................................................................................faces DEAL::..............................................................................................................................................................................................................................................................................................................................................................................lines DEAL::ExcPointerIndexClash() -DEAL::ExcPointerIndexClash() DEAL::Save3D DEAL::Load3D DEAL::.........................................................................cells @@ -37,7 +34,6 @@ DEAL::.........................................................................c DEAL::..........................................................................................................................................................................................................................................................................................faces DEAL::..............................................................................................................................................................................................................................................................................................................................................................................lines DEAL::ExcPointerIndexClash() -DEAL::ExcPointerIndexClash() DEAL::Save3D DEAL::Load3D DEAL::.........................................................................cells -- 2.39.5