diff --git a/.gitignore b/.gitignore index fd1a7c349..8e19d4018 100644 --- a/.gitignore +++ b/.gitignore @@ -26,12 +26,6 @@ ipch/ *.bak bin/ build*/ -game-e2/data -game-e2/*.log* -game-e2/reports/ -game-e3/data/ -game-e3/*.log* -game-e3/reports/ *.log *.log.* tags diff --git a/src/lighthouse.test.c b/src/lighthouse.test.c index 193de58a6..ded77649a 100644 --- a/src/lighthouse.test.c +++ b/src/lighthouse.test.c @@ -18,12 +18,11 @@ static void test_lighthouse_range(CuTest * tc) { faction *f; unit *u; - region *r1, *r2; + region *r1; building *b; test_setup(); r1 = test_create_region(0, 0, 0); - r2 = test_create_region(1, 0, 0); f = test_create_faction(0); u = test_create_unit(f, r1); b = test_create_building(r1, test_create_buildingtype("lighthouse")); diff --git a/tests/data/184.dat b/tests/data/184.dat index d219f92dd..a1ee8802a 100644 Binary files a/tests/data/184.dat and b/tests/data/184.dat differ diff --git a/tests/run-turn.sh b/tests/run-turn.sh index d47ac81a2..519ed8bd8 100755 --- a/tests/run-turn.sh +++ b/tests/run-turn.sh @@ -53,6 +53,9 @@ assert_grep_count reports/$CRFILE '^BURG' 1 assert_grep_count reports/$CRFILE '^EINHEIT' 2 assert_grep_count reports/$CRFILE '^GEGENSTAENDE' 2 +assert_grep_count reports/185-heg.nr 'erblickt' 6 +assert_grep_count reports/185-heg.cr '"lighthouse";visibility' 6 +assert_grep_count reports/185-heg.cr '"neighbour";visibility' 11 assert_grep_count reports/185-6rLo.cr '^EINHEIT' 2 assert_grep_count reports/185-6rLo.cr '^REGION' 13 echo "integration tests: PASS"