make test work

git-svn-id: https://svn.dealii.org/trunk@29704 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/grid/subdomain_id_01.cc b/tests/grid/subdomain_id_01.cc
index 49bac533316be24be5318a1f81a21ed21c088ff7..ab012a8c02565a5b59d4900be587bef4583d35e0 100644 (file)
--- a/tests/grid/subdomain_id_01.cc
+++ b/tests/grid/subdomain_id_01.cc
@@ -39,8 +39,17 @@ void check (TRIA & tr)
   
   for (; cell!=endc; ++cell)
     {
-      deallog << cell->level_subdomain_id()
-             << " " << cell->subdomain_id() << std::endl;
+      deallog << cell->level_subdomain_id() << " ";
+      try
+       {
+         deallog << cell->subdomain_id();
+       }
+      catch (...)
+       {
+         deallog << ".";
+         
+       }
+      deallog << std::endl;
     }
   
   deallog << "OK" << std::endl;
@@ -49,6 +58,8 @@ void check (TRIA & tr)
 
 int main (int argc, char *argv[]) 
 {
+  deal_II_exceptions::disable_abort_on_exception();
+
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   std::ofstream logfile("subdomain_id_01/output");
   deallog.attach(logfile);

diff --git a/tests/grid/subdomain_id_01/cmp/generic b/tests/grid/subdomain_id_01/cmp/generic
index 521a63a515e3e0e651ab252c79a0aa8ea1524ecd..1ec04caf80b8ba66d7ddb00d7cc118f95f38ba38 100644 (file)
--- a/tests/grid/subdomain_id_01/cmp/generic
+++ b/tests/grid/subdomain_id_01/cmp/generic
@@ -1,10 +1,45 @@
 
-DEAL::n_active_cells: 4
-DEAL::n_active_cells: 5
-DEAL::OK for 1d
-DEAL::n_active_cells: 16
-DEAL::n_active_cells: 28
-DEAL::OK for 2d
-DEAL::n_active_cells: 64
-DEAL::n_active_cells: 176
-DEAL::OK for 3d
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::OK
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 .
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::0 0
+DEAL::OK