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

fix gcc compilation 

fix broken test for duplicate orders
This commit is contained in:
Enno Rehling 2012-07-09 01:25:09 +02:00
parent 0a756efba9
commit cb56a820b5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/tests/common.lua
View File

@ -980,8 +980,8 @@ function test_bug_1679()
local file = io.open(filename, "w") local file = io.open(filename, "w")
file:write('ERESSEA ' .. itoa36(f.id) .. ' "' .. f.password .. '"\n') file:write('ERESSEA ' .. itoa36(f.id) .. ' "' .. f.password .. '"\n')
file:write('EINHEIT ' .. itoa36(u.id) .. "\n") file:write('EINHEIT ' .. itoa36(u.id) .. "\n")
file:write("NACH W\n")
file:write("ARBEITEN\n") file:write("ARBEITEN\n")
file:write("NACH W\n")
file:close() file:close()
eressea.read_orders(filename) eressea.read_orders(filename)
@ -989,7 +989,7 @@ function test_bug_1679()
init_reports() init_reports()
write_report(f) write_report(f)
assert_true(find_in_report(f, "Die Einheit kann keine weiteren langen Befehle", "cr")) assert_true(find_in_report(f, "Die Einheit kann keine weiteren langen Befehle", "cr"))
assert_true(find_in_report(f, "entdeckt, dass es keinen Weg nach Westen gibt")) assert_false(find_in_report(f, "entdeckt, dass es keinen Weg nach Westen gibt"))
end end
function test_building_unique0() function test_building_unique0()

1
src/gamecode/report.c
View File

@ -221,7 +221,6 @@ rparagraph(FILE * F, const char *str, ptrdiff_t indent, int hanging_indent,
static void nr_spell(FILE * F, spellbook_entry * sbe, const struct locale *lang) static void nr_spell(FILE * F, spellbook_entry * sbe, const struct locale *lang)
{ {
int bytes, k, itemanz, costtyp; int bytes, k, itemanz, costtyp;
int dh = 0;
char buf[4096]; char buf[4096];
char *bufp = buf; char *bufp = buf;
size_t size = sizeof(buf) - 1; size_t size = sizeof(buf) - 1;