Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new gcc spouts more warnings, fix them.

This commit is contained in:
Enno Rehling 2012-05-18 19:29:35 -07:00
parent 8cd99bf88c
commit 0616549ea5
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/building_test.c
View File

@ -308,6 +308,10 @@ static void test_buildingowner_resets_when_dead(CuTest * tc)
CuAssertPtrEquals(tc, 0, building_owner(bld)); CuAssertPtrEquals(tc, 0, building_owner(bld));
} }
void test_buildingowner_goes_to_empty_unit_if_no_other(CuTest * tc)
{
}
CuSuite *get_building_suite(void) CuSuite *get_building_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
@ -320,5 +324,6 @@ CuSuite *get_building_suite(void)
SUITE_ADD_TEST(suite, test_buildingowner_goes_to_next_after_leave); SUITE_ADD_TEST(suite, test_buildingowner_goes_to_next_after_leave);
SUITE_ADD_TEST(suite, test_buildingowner_goes_to_other_after_leave); SUITE_ADD_TEST(suite, test_buildingowner_goes_to_other_after_leave);
SUITE_ADD_TEST(suite, test_buildingowner_goes_to_same_faction_after_leave); SUITE_ADD_TEST(suite, test_buildingowner_goes_to_same_faction_after_leave);
SUITE_ADD_TEST(suite, test_buildingowner_goes_to_empty_unit_if_no_other);
return suite; return suite;
} }

1
src/kernel/move_test.c
View File

@ -25,6 +25,7 @@ static void test_building_type_exists(CuTest * tc)
r = findregion(-1, 0); r = findregion(-1, 0);
b = new_building(btype, r, default_locale); b = new_building(btype, r, default_locale);
CuAssertPtrNotNull(tc, b);
CuAssertTrue(tc, buildingtype_exists(r, NULL, true) == false); CuAssertTrue(tc, buildingtype_exists(r, NULL, true) == false);
CuAssertTrue(tc, buildingtype_exists(r, btype, true) == true); CuAssertTrue(tc, buildingtype_exists(r, btype, true) == true);
CuAssertTrue(tc, buildingtype_exists(r, btype2, true) == false); CuAssertTrue(tc, buildingtype_exists(r, btype2, true) == false);

3
src/tests.c
View File

@ -151,7 +151,6 @@ void test_create_world(void)
{ {
terrain_type *t_plain, *t_ocean; terrain_type *t_plain, *t_ocean;
region *island[2]; region *island[2];
race *rc_human;
int i; int i;
building_type *btype; building_type *btype;
ship_type *stype; ship_type *stype;
@ -179,7 +178,7 @@ void test_create_world(void)
} }
} }
rc_human = test_create_race("human"); test_create_race("human");
btype = (building_type*)calloc(sizeof(building_type), 1); btype = (building_type*)calloc(sizeof(building_type), 1);
btype->flags = BTF_NAMECHANGE; btype->flags = BTF_NAMECHANGE;