Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
7083 commits 10 branches 0 tags 41 MiB
Commit graph

39 commits

Author SHA1 Message Date
Enno Rehling
b5ed9e96dd re-enable disabled test (it passes, so what gives?) 2016-08-21 06:59:43 +02:00
Enno Rehling
c1b0395a6c Merge branch 'master' into develop 
Conflicts:
	src/kernel/save.test.c
	src/kernel/version.h
 2016-05-20 23:07:18 +02:00
Enno Rehling
cdd7606f02 fixing the password saving test. 2016-05-20 22:38:18 +02:00
Enno Rehling
637054bc22 memory leak: clean up mstream after test 2016-03-11 11:33:45 +01:00
Enno Rehling
5f923295e6 remove datafiles from save.test.c 
this should fix intermittent tests on windows.
 2016-02-26 19:49:58 +01:00
Enno Rehling
63408501b9 convert another test to read_/write_game 2016-02-26 19:01:28 +01:00
Enno Rehling
3c272fd53f fix reading and writing curses from test (crash) 
fix read_game/write_game incomaptibility.
 2016-02-26 17:54:25 +01:00
Enno Rehling
db852a05fd eliminate global.data_version completely 2016-02-24 11:58:05 +01:00
Enno Rehling
7f6ced99b9 attrib.read gets a gamedata object (remove dependency on global.data_version) 2016-02-24 11:44:18 +01:00
Enno Rehling
775bbe7ea6 refactor another test to not create files. 2016-02-24 11:39:24 +01:00
Enno Rehling
ec3839fb9f rewrite intermittent test to use memory stream. 2016-02-24 11:39:23 +01:00
Enno Rehling
6ca81646eb extract gamedata into a separate file. 2016-02-24 11:38:09 +01:00
Enno Rehling
e6f3dc8b85 Merge branch 'master' into develop 
Conflicts:
	scripts/run-turn.lua
	src/buildno.h
	src/kernel/group.c
	src/kernel/save.c
	src/kernel/save.test.c
	src/kernel/version.h
	src/util/password.c
	src/util/password.test.c
	tests/run-turn.sh
 2016-02-23 10:47:33 +01:00
Enno Rehling
7fe07439f5 fix write_faction_reference, check for f->alive in other places 
TODO:
1. I added some new TODOs
2. What happens to morale when region owners die?
3. Needs tests
 2016-02-22 20:47:06 +01:00
Enno Rehling
6b1367dff1 fix gcc build 2016-02-22 15:48:43 +01:00
Enno Rehling
4f01d7041f Merge branch 'upstream-master' 
Conflicts:
	src/kernel/save.test.c
	src/kernel/version.h
 2016-02-22 08:55:46 +01:00
Enno Rehling
b09c6974c6 revert back to plaintext passwords, crypting isn't working 2016-02-21 17:22:43 +01:00
Enno Rehling
4bf282bdd7 Merge branch 'release-3.7.11' into upstream-master 
accidentally added a test that fails for the currently broken passwort-crypting

Conflicts:
	scripts/tests/e3/rules.lua
	src/attributes/reduceproduction.c
	src/building_action.c
	src/buildno.h
	src/kernel/region.c
	src/kernel/save.c
	src/kernel/save.test.c
	src/kernel/version.h
	src/laws.c
	src/magic.c
	src/magic.h
	src/wormhole.c
 2016-02-21 11:01:50 +01:00
Enno Rehling
dd94771ed8 test password reading and writing for BADCRYPT_VERSION (requires external file) 2016-02-21 10:25:18 +01:00
Enno Rehling
9ac05666ea add a test for succesful read/write of password 
TODO: do this for different datafile versions (BADCRYPT, etc)
 2016-02-21 10:10:26 +01:00
Enno Rehling
57085ea47b gcc fix, disable test properly 
TBD:plane.watchers
 2016-02-18 08:11:39 +01:00
Enno Rehling
9f62e74a37 add a test to check that destroyfaction updates the alliance leader. 
clean up save.test.c a bit.
disable failing test temporarily.
 2016-02-17 14:06:59 +01:00
Enno Rehling
a6fe697c7a tests for read/write of triggers that reference factions, with bugfixes. 2016-02-17 13:55:48 +01:00
Enno Rehling
325a0ccbf1 write a test that proves the bug in turn 966 2016-02-17 09:24:19 +01:00
Enno Rehling
87aa7c887e fix build 2016-02-09 14:08:36 +01:00
Enno Rehling
0189111876 update key attribute api 
prepare to replace at_key. do not return the internals. add basic test.
 2016-02-09 06:43:19 +01:00
Enno Rehling
abc3caa6d1 optimized storage of attribs. 
save the hash instead of the name and save a few bytes.
 2016-02-09 00:28:23 +01:00
Enno Rehling
7b4b879cc1 quick addition to a_removeall 
additional testing for attributes
 2016-02-06 10:56:08 +01:00
Enno Rehling
8a3bb35987 eliminate global log_flags, revert the mode arguments for fopen. 
turns out that text is default, and windows hates it if I open a binary file without 'b'
standardize on using join_path to create filenames
(use backslash on windows, even though fopen doesn't seem to care).
 2016-02-05 23:10:05 +01:00
Enno Rehling
85010e5358 seems like there is a problem opening files with the optional 'b' mode, so remove it everywhere? 2016-02-01 12:29:41 +01:00
Enno Rehling
2f2bbb16ab remove wild mkdir calls all over the code, catch EEXIST errors 
use join_path more consistently
fix a test that's intermittent on windows because fopen(..., "wb") fails, why?
 2016-02-01 09:26:24 +01:00
Enno Rehling
73f16d5bb6 adding a join_path function to try and narrow down misbehavior. 2016-01-29 19:11:48 +01:00
Enno Rehling
9bf1059d8a trying to make tests not throw out so many ERROR log mesages, commenting on some of them. 2016-01-29 17:49:27 +01:00
Enno Rehling
17068af332 unusual potion delay attribute can use a potion in another region? unclear what this code does, but fixing my bad assumption. 2015-11-22 14:36:05 +01:00
Enno Rehling
797eee025d fix cb_insert comparison (new return value for success) 2015-11-05 13:01:48 +01:00
Enno Rehling
024e4c45ca fix a bug introduced by f78fe842 (CID 22443) 2015-11-04 10:40:53 +01:00
Enno Rehling
9b9e038438 press F3 to save game in editor. 2015-05-12 17:18:51 -07:00
Enno Rehling
e1d5033b76 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:13:25 +01:00
Enno Rehling
38352ef3bf add the build number to saves. 
this should make future debugging sessions easier, telling us what bugs were or were not fixed at the time of an incident.
added a test to make sure data file can be read/written, and at a minimum, sets global data-version.
also clean up test framework a bit, and introduce a helpful macro.
 2014-08-14 05:06:36 +02:00