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

Merge branch 'develop' into kill-seen-region 

Conflicts:
	src/lighthouse.test.c
This commit is contained in:
Enno Rehling 2016-09-17 21:41:36 +02:00
parent e97ebb0469 34149b9fab
commit 2e0f96bae3
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -26,12 +26,6 @@ ipch/
*.bak *.bak
bin/ bin/
build*/ build*/
game-e2/data
game-e2/*.log*
game-e2/reports/
game-e3/data/
game-e3/*.log*
game-e3/reports/
*.log *.log
*.log.* *.log.*
tags tags

BIN
tests/data/184.dat
View File

Binary file not shown.

3
tests/run-turn.sh
View File

@ -53,6 +53,9 @@ assert_grep_count reports/$CRFILE '^BURG' 1
assert_grep_count reports/$CRFILE '^EINHEIT' 2 assert_grep_count reports/$CRFILE '^EINHEIT' 2
assert_grep_count reports/$CRFILE '^GEGENSTAENDE' 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 '^EINHEIT' 2
assert_grep_count reports/185-6rLo.cr '^REGION' 13 assert_grep_count reports/185-6rLo.cr '^REGION' 13
echo "integration tests: PASS" echo "integration tests: PASS"