fix a bunch of tests

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

diff --git a/tests/serialization/dof_handler_01.cc b/tests/serialization/dof_handler_01.cc
index a218b2f7b8bced26f5b935ab2da4effa9bd638e9..2d292b9dddfa3be2776d326869e7a229588cdb85 100644 (file)
--- a/tests/serialization/dof_handler_01.cc
+++ b/tests/serialization/dof_handler_01.cc
@@ -65,7 +65,8 @@ namespace dealii
              }
          }
 
-       if (c1->subdomain_id() != c2->subdomain_id())
+       if (c1->active() && c2->active()
+           && (c1->subdomain_id() != c2->subdomain_id()))
          return false;
 
        if (c1->material_id() != c2->material_id())

diff --git a/tests/serialization/triangulation_01.cc b/tests/serialization/triangulation_01.cc
index 1a899badeda467e337ddf8c82d1713d1dbfd1aaf..7c7c923b095a21d5268706d46760c35ac05bb188 100644 (file)
--- a/tests/serialization/triangulation_01.cc
+++ b/tests/serialization/triangulation_01.cc
@@ -69,7 +69,8 @@ namespace dealii
              }
          }
 
-       if (c1->subdomain_id() != c2->subdomain_id())
+       if (c1->active() && c2->active()
+           && (c1->subdomain_id() != c2->subdomain_id()))
          return false;
 
        if (c1->level_subdomain_id() != c2->level_subdomain_id())

diff --git a/tests/serialization/triangulation_02.cc b/tests/serialization/triangulation_02.cc
index 1fb249892dbdd607b71f04fb17925a6c592496d3..9d21e3f7331aaa3d7de94c0c2e7d4cba3a23a221 100644 (file)
--- a/tests/serialization/triangulation_02.cc
+++ b/tests/serialization/triangulation_02.cc
@@ -71,7 +71,8 @@ namespace dealii
              }
          }
 
-       if (c1->subdomain_id() != c2->subdomain_id())
+       if (c1->active() && c2->active()
+           && (c1->subdomain_id() != c2->subdomain_id()))
          return false;
 
        if (c1->level_subdomain_id() != c2->level_subdomain_id())