From 6d34d63d4f73aedf6e2ec2bef96453f75770ccd7 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Jul 2015 05:24:28 +0200 Subject: [PATCH 1/3] don't want slack/travis notifications for this fork. --- .travis.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index b94f25302..f15400612 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,13 @@ language: c compiler: - - gcc - - clang +- gcc +- clang before_install: - - sudo apt-get update -qq +- sudo apt-get update -qq install: - - sudo apt-get install -qq zlib1g-dev libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev valgrind clang +- sudo apt-get install -qq zlib1g-dev libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev valgrind clang script: - - s/travis-build +- s/travis-build os: - - linux - - osx -notifications: - slack: - secure: F89aXLWaE125PaJIlETv12jT4EfH6wLXJmGCPZzrN3OcLn2ahDWqjwuzR7lOEDf2nAISmeMPyDZMhEHXLNHAE5qP6lg9yliYQw5hzGmDK9m1xUq/pPEne/b2Y7K3my1mkRZ6n3asbHgSmBWAfCIk1JN8R5Rv+rmbLuWLc+zofts= +- linux +- osx From f1217ed7a9dab167cf27a398939d29065012d95b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Jul 2015 16:11:25 +0200 Subject: [PATCH 2/3] Bug 1965: verify that buildings cannot be built on packice. --- scripts/tests/e3/castles.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/tests/e3/castles.lua b/scripts/tests/e3/castles.lua index 1aa2bb17c..b9cbabe0b 100644 --- a/scripts/tests/e3/castles.lua +++ b/scripts/tests/e3/castles.lua @@ -25,3 +25,28 @@ function test_small_castles() assert_equal("site", b:get_typename(9)) assert_equal("fortification", b:get_typename(10)) end + +function test_build_normal() + local r = region.create(0, 0, "plain") + local f = faction.create("noreply@eressea.de", "human", "de") + local u = unit.create(f, r, 1) + u:clear_orders() + u:add_item("stone", 10) + u:set_skill("building", 10) + u:add_order("MACHE BURG") + process_orders() + assert_not_nil(u.building) + assert_equal(10, u.building.size) +end + +function test_build_packice() + local r = region.create(0, 0, "packice") + local f = faction.create("noreply@eressea.de", "human", "de") + local u = unit.create(f, r, 1) + u:clear_orders() + u:add_item("stone", 10) + u:set_skill("building", 10) + u:add_order("MACHE BURG") + process_orders() + assert_equal(nil, u.building) +end From 2b57fd9d83a5da1bdfc02ba191645d5538b7e8ba Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Jul 2015 16:18:08 +0200 Subject: [PATCH 3/3] whatever. Slack-Travis is back on. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f15400612..90c0c9c7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,6 @@ script: os: - linux - osx +notifications: + slack: + secure: F89aXLWaE125PaJIlETv12jT4EfH6wLXJmGCPZzrN3OcLn2ahDWqjwuzR7lOEDf2nAISmeMPyDZMhEHXLNHAE5qP6lg9yliYQw5hzGmDK9m1xUq/pPEne/b2Y7K3my1mkRZ6n3asbHgSmBWAfCIk1JN8R5Rv+rmbLuWLc+zofts= \ No newline at end of file