From 57085ea47bc89e66690c67e8ca61d7e0252e07c2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 18 Feb 2016 08:11:39 +0100
Subject: [PATCH] gcc fix, disable test properly TBD:plane.watchers

---
 src/kernel/save.c      | 1 +
 src/kernel/save.test.c | 5 ++---
 src/tests.c            | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/kernel/save.c b/src/kernel/save.c
index 94b6e55df..afc794ea0 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -1309,6 +1309,7 @@ void writefaction(struct gamedata *data, const faction * f)
     ally *sf;
     ursprung *ur;
 
+    assert(f->_alive);
     write_faction_reference(f, data->store);
     WRITE_INT(data->store, f->subscription);
 #if RELEASE_VERSION >= SPELL_LEVEL_VERSION
diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c
index 6ce563a41..87658187c 100644
--- a/src/kernel/save.test.c
+++ b/src/kernel/save.test.c
@@ -6,6 +6,7 @@
 #include "group.h"
 #include "ally.h"
 #include "faction.h"
+#include "plane.h"
 #include "region.h"
 #include "version.h"
 #include <triggers/changefaction.h>
@@ -113,12 +114,10 @@ static void test_readwrite_dead_faction_regionowner(CuTest *tc) {
     faction *f;
     region *r;
     unit * u;
-    int fno;
 
     test_cleanup();
     config_set("rules.region_owners", "1");
     f = test_create_faction(0);
-    fno = f->no;
     u = test_create_unit(f, r = test_create_region(0, 0, 0));
     region_set_owner(r, f, turn);
     destroyfaction(&factions);
@@ -204,6 +203,6 @@ CuSuite *get_save_suite(void)
     SUITE_ADD_TEST(suite, test_readwrite_dead_faction_createunit);
     SUITE_ADD_TEST(suite, test_readwrite_dead_faction_changefaction);
     SUITE_ADD_TEST(suite, test_readwrite_dead_faction_regionowner);
-//    SUITE_ADD_TEST(suite, test_readwrite_dead_faction_group);
+    DISABLE_TEST(suite, test_readwrite_dead_faction_group);
     return suite;
 }
diff --git a/src/tests.c b/src/tests.c
index b8508b4cc..b52759489 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -5,6 +5,7 @@
 #include "prefix.h"
 
 #include <kernel/config.h>
+#include <kernel/plane.h>
 #include <kernel/region.h>
 #include <kernel/terrain.h>
 #include <kernel/item.h>
@@ -47,7 +48,7 @@ struct region *test_create_region(int x, int y, const terrain_type *terrain)
 {
     region *r = findregion(x, y);
     if (!r) {
-        r = new_region(x, y, NULL, 0);
+        r = new_region(x, y, findplane(x, y), 0);
     }
     if (!terrain) {
         terrain_type *t = get_or_create_terrain("plain");