empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

econfig: New key running_test_suite, for use by tests

Browse source 
For now, it just logs "Configured for testing" on startup, and prints
a scary warning on player login.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-13 19:29:18 +01:00
parent 558b4078ff
commit f7ac7532b2
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/econfig-spec.h
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Marc Olzheim, 2004 * Marc Olzheim, 2004
* Markus Armbruster, 2004-2013 * Markus Armbruster, 2004-2014
*/ */
/* /*
@ -395,6 +395,8 @@ EMPCFBOTH("news_keep_days", news_keep_days, int, NSC_INT, KM_INTERNAL,
"How long until news expire") "How long until news expire")
EMPCFBOTH("lost_keep_hours", lost_keep_hours, int, NSC_INT, KM_INTERNAL, EMPCFBOTH("lost_keep_hours", lost_keep_hours, int, NSC_INT, KM_INTERNAL,
"How long until lost items expire") "How long until lost items expire")
EMPCFBOTH("running_test_suite", running_test_suite, int, NSC_INT, KM_INTERNAL,
"Are we running the test suite? Must be 0 for games!")
/* Sentinel */ /* Sentinel */
EMPCFONLYC(NULL, emp_config_dummy, NULL, NSC_NOTYPE, 0, NULL) EMPCFONLYC(NULL, emp_config_dummy, NULL, NSC_NOTYPE, 0, NULL)

4
src/lib/global/constants.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Ken Stevens, 1995 * Ken Stevens, 1995
* Steve McClure, 1996 * Steve McClure, 1996
* Markus Armbruster, 2004-2013 * Markus Armbruster, 2004-2014
*/ */
#include <config.h> #include <config.h>
@ -47,6 +47,8 @@ char *post_crash_dump_hook = "";
char *disabled_commands = ""; char *disabled_commands = "";
int running_test_suite = 0; /* For use by "make check" only */
int keep_journal = 0; /* journal log file enabled */ int keep_journal = 0; /* journal log file enabled */
int WORLD_X = 64; /* World size - x */ int WORLD_X = 64; /* World size - x */

6
src/lib/player/player.c
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Steve McClure, 2000 * Steve McClure, 2000
* Markus Armbruster, 2004-2012 * Markus Armbruster, 2004-2014
* Ron Koenderink, 2004-2009 * Ron Koenderink, 2004-2009
*/ */
@ -60,6 +60,10 @@ player_main(struct player *p)
time(&player->curup); time(&player->curup);
update_timeused_login(player->curup); update_timeused_login(player->curup);
show_motd(); show_motd();
if (running_test_suite)
pr("\n"
"*** Server configured for testing ***\n"
"*** If you see this in a game, it is misconfigured! ***\n");
if (init_nats() < 0) { if (init_nats() < 0) {
pr("Server confused, try again later\n"); pr("Server confused, try again later\n");
return; return;

4
src/server/main.c
View file

@ -31,7 +31,7 @@
* Steve McClure, 1996, 1998 * Steve McClure, 1996, 1998
* Doug Hay, 1998 * Doug Hay, 1998
* Ron Koenderink, 2004-2009 * Ron Koenderink, 2004-2009
* Markus Armbruster, 2005-2013 * Markus Armbruster, 2005-2014
*/ */
#include <config.h> #include <config.h>
@ -381,6 +381,8 @@ start_server(int flags)
create_pidfile(pidfname, pid); create_pidfile(pidfname, pid);
logerror("------------------------------------------------------"); logerror("------------------------------------------------------");
logerror("Empire server (pid %d) started", (int)pid); logerror("Empire server (pid %d) started", (int)pid);
if (running_test_suite)
logerror("Configured for testing");
empth_init((void **)&player, flags); empth_init((void **)&player, flags);