From: Timo Heister <timo.heister@gmail.com>
Date: Sat, 1 Jun 2013 20:31:25 +0000 (+0000)
Subject: fix a bunch of tests
X-Git-Tag: v8.0.0~335
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3941b42a9f608c321b10c03422dc457165e6ad10;p=dealii.git

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 a218b2f7b8..2d292b9ddd 100644
--- 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 1a899baded..7c7c923b09 100644
--- 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 1fb249892d..9d21e3f733 100644
--- 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())