New make target check

Just a smoke test so far, extracted from src/scripts/nightly/. This makes the existing smoke test more easily accessible. Noteworthy differences: * Instead of patching the code to make output more stable, postprocess the output to normalize it. * Compare actual results to expected results instead of the previous test run's results. * Much faster. The old test harness used sleep liberally to "ensure" things always happen in the same order. Known shortcomings: * The smoke test hangs when the server fails to complete startup, or fails to terminate. * Normalization of xdump hardcodes columns instead of getting them from xdump meta. * Normalization of time values in xdump is an ugly hack. * xdump meta column type isn't normalized. Actual values can vary between systems, because the width of enumeration types is implementation-defined. The smoke test works only when they're represented as int, which is the case on common systems. * Currently expected to work only with thread package LWP and a random() that behaves exactly like the one on my development system, because: - Thread scheduling is reliably deterministic only with LWP - The PRN sequence produced by random() isn't portable - Shell builtin kill appears not to do the job in MinGW - The Windows server tries to run as service when -d isn't specified Further work is needed to address these shortcomings. Getting C programs behave exactly the same on all systems is hard. We'll likely run into system-dependent differences that upset the smoke test. Floating-point computation seems particularly vulnerable. Instead of updating src/scripts/nightly/ to use "make check", retire it. It hasn't been used in quite a while. Investing more into our homegrown auto-builder doesn't make sense, as canned auto-builders such as Travis CI and Jenkins are readily available. The shell scripts src/scripts/nightly/tests/?? become Empire batch files tests/smoke/. The shell scripts are actually shell boilerplate around Empire batch files. To make sure git recognizes the move, this commit moves them unchanged. tests/smoke-test strips the boilerplate before it feeds the batch files to the client. The next commit will get rid fo that.
2012-07-14 08:46:38 +02:00 · 2012-07-14 08:46:38 +02:00 · 49b2b13a90
commit 49b2b13a90
parent 2fefdaed15
69 changed files with 17579 additions and 827 deletions
--- a/src/scripts/nightly/.gitignore
+++ b/src/scripts/nightly/.gitignore
@ -1,2 +0,0 @@
-boxes
-logs
--- a/src/scripts/nightly/common.sh
+++ b/src/scripts/nightly/common.sh
@ -1,32 +0,0 @@
-#
-# Common functions
-#
-# Blame it on marcolz
-#
-err() {
-	echo "ERROR: $@" >&2
-	exit 1
-}
-
-warn() {
-	echo "WARNING: $@" >&2
-}
-
-trykill() {
-	[ -n "$1" ] || { warn "INTERNAL ERROR: trykill: no argument ?" ; return 2 ; }
-	kill -TERM "$1" || { warn "Could not kill pid '${1}'" ; return 1 ; }
-	sleep 1
-	/bin/kill -KILL "$1" 2>/dev/null && { warn "Process ${1} would not die" ; }
-	sleep 1
-	/bin/kill -KILL "$1" 2>/dev/null && { warn "Process ${1} would not die after -KILL" ; return 1 ; }
-
-	return 0
-}
-
-runfeed() {
-	[ -n "$1" ] || { warn "INTERNAL ERROR: No coun/repr given ?" ; return 2 ; }
-	REP="$2"
-	[ -n "$REP" ] || REP="$1"
-	${EMPIRE_PATH}/empire "$1" "$REP" || { warn "empire not ok ?" ; return 1 ; }
-	return 0
-}
--- a/src/scripts/nightly/conf/ubuntu-lwp.i386.config
+++ b/src/scripts/nightly/conf/ubuntu-lwp.i386.config
@ -1,8 +0,0 @@
-SCRIPTDIR=/home/empire
-BOXDIR=boxes
-LOGDIR=logs
-INSTANCE=ubuntu-lwp.i386
-EMPPORT=8889
-NIGHTLY_SKIP_STEP=
-GITROOT=/home/empire/empserver.git
-export LANG=C
--- a/src/scripts/nightly/conf/ubuntu-pthread.i386.config
+++ b/src/scripts/nightly/conf/ubuntu-pthread.i386.config
@ -1,9 +0,0 @@
-SCRIPTDIR=/home/empire
-BOXDIR=boxes
-LOGDIR=logs
-INSTANCE=ubuntu-pthread.i386
-EMPPORT=8889
-NIGHTLY_SKIP_STEP=
-GITROOT=/home/empire/empserver.git
-export LANG=C
-export CONFIGURE_OPTIONS="--with-pthread"
--- a/src/scripts/nightly/conf/win32.i386.config
+++ b/src/scripts/nightly/conf/win32.i386.config
@ -1,10 +0,0 @@
-SCRIPTDIR=/home/empire
-export BOXDIR=boxes
-LOGDIR=logs
-export INSTANCE=win32.i386
-EMPPORT=8889
-NIGHTLY_SKIP_STEP=
-GITROOT=ssh://ron-VM3/~empire/empserver.git
-PATH=$PATH:/c/Progra~1/git/bin
-export MINGW_DIR="c:/MinGW"
-
--- a/src/scripts/nightly/cron/cron.ubuntu.i386
+++ b/src/scripts/nightly/cron/cron.ubuntu.i386
@ -1,8 +0,0 @@
-#!/bin/sh
-cd /home/empire/empserver.git
-git pull 2>&1 >/dev/null
-cd /home/empire
-./nightlybuild.sh ubuntu-lwp.i386.config
-./report.sh ubuntu-lwp.i386.config | mutt -s 'empserver ubuntu-lwp.i386' empserver-devel@lists.sourceforge.net
-./nightlybuild.sh ubuntu-pthread.i386.config
-./report.sh ubuntu-pthread.i386.config | mutt -s 'empserver ubuntu-pthread.i386' empserver-devel@lists.sourceforge.net
--- a/src/scripts/nightly/cron/cron.win32.i386
+++ b/src/scripts/nightly/cron/cron.win32.i386
@ -1,5 +0,0 @@
-#!/bin/sh
-cd /home/empire
-./nightlybuild.sh win32.i386.config </dev/null
-./report.sh win32.i386.config | /c/download/blat250/full/blat.exe -to empserver-devel@lists.sourceforge.net -subject "empserver win32.i386" -p ron
-:end
--- a/src/scripts/nightly/diff_to_prev.sh
+++ b/src/scripts/nightly/diff_to_prev.sh
@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Check differences between the last two logs
-#
-# Blame it on marcolz
-#
-
-PROGNAME="$0"
-
-usage() {
-	echo "Usage: ${PROGNAME} <configfile>" >&2;
-	exit 1;
-}
-
-[ $# -lt 1 ] && usage
-
-[ -f "$1" ] || usage
-
-# Source config file
-case "$1"
-in
-	*/*)
-		. "$1"
-		;;
-	*)
-		. ./"$1"
-		;;
-esac
-
-[ -f "${SCRIPTDIR}/common.sh" ] || { echo "Broken config ?" >&2; exit 1; }
-. "${SCRIPTDIR}"/common.sh
-
-cd "${LOGDIR}" || err "Could not cd to ${LOGDIR}"
-
-diff -u $(ls "${INSTANCE}."* | tail -2)
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@ -1,496 +0,0 @@
-#!/bin/sh
-#
-# Blame it on marcolz
-#
-# Skip certain parts of this script by exporting the variable
-# "NIGHTLY_SKIP_STEP" containing the following possible substrings,
-# preventing the named behaviour:
-#
-# REDIRECT	-	Redirect all output to a logfile
-# CHECKOUT	-	Fill the sandbox with a fresh checkout
-# PATCH		-	Apply the patches for this system (global + specific)
-# BUILD		-	Build everything
-# GENERATE	-	Generate a new world
-# SERVERSTART	-	Start the server
-# TESTSCRIPT	-	Run the testscript
-# SERVERSTOP	-	Stop the server if it was started by this script
-# CLEANUP	-	Remove the contents of the sandbox
-# REMOVE_REPOSITORY	Removes the git repository when cleaning up
-#
-
-PROGNAME="$0"
-TERM="${TERM:-vt100}"
-export TERM
-
-usage() {
-	echo "Usage: ${PROGNAME} <configfile>" >&2;
-	exit 1;
-}
-
-[ $# -lt 1 ] && usage
-
-[ -f "$1" ] || usage
-
-# Source config file
-case "$1"
-in
-	*/*)
-		. "$1"
-		;;
-	*)
-		. ./"$1"
-		;;
-esac
-
-[ -f "${SCRIPTDIR}/common.sh" ] || { echo "Broken config ?" >&2; exit 1; }
-. "${SCRIPTDIR}"/common.sh
-export SCRIPTDIR
-
-
-STAMP="`date +%Y%m%d%H%M%S`"
-WORKDIR="${INSTANCE}"
-[ -n "${EXTRASUFFIX}" ] && WORKDIR="${WORKDIR}.${EXTRASUFFIX}"
-LOGFILE="${LOGDIR}/${WORKDIR}.${STAMP}"
-
-#
-# START REDIRECT
-#
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*REDIRECT*) ;;
-	*)
-
-# Log everything
-exec > "${LOGFILE}"
-exec 2>&1
-
-		;;
-esac
-#
-# END REDIRECT
-#
-
-case "${BOXDIR}"
-in
-	/*)
-		;;
-	*)
-		BOXDIR="${SCRIPTDIR}/${BOXDIR}"
-		;;
-esac
-
-cd "${BOXDIR}" || err "Could not chdir to ${BOXDIR}"
-
-echo "Nightly build starting at `date`"
-
-
-#
-# START CHECKOUT
-#
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*CHECKOUT*) ;;
-	*)
-
-# Make sandbox
-if [ -d "${WORKDIR}" ]
-then
-	[ -d "${WORKDIR}"/empserver/.git ] || err "Invalid sandbox, missing .git directory"
-else
-	echo making directory
-	mkdir "${WORKDIR}" || warn "Could not create ${BOXDIR}/${WORKDIR}"
-fi
-cd "${WORKDIR}" || err "Could not cd to ${BOXDIR}/${WORKDIR}"
-
-echo "Getting source from GIT:"
-# Extract source
-export GITROOT=${GITROOT:= git://git.pond.sub.org/~armbru/empserver}
-RETR=0
-if ! [ -d empserver ]
-then
-	while ! git clone --quiet $GITROOT empserver >/dev/null
-	do
-		sleep "`expr 5 + ${RETR}`"
-		RETR="`expr 1 + ${RETR}`"
-		[ "${RETR}" -gt 5 ] && err "git clone Timeout after ${RETR} retres."
-	done
-	cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
-else
-	cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
-	while ! git pull --quiet $GITROOT master >/dev/null
-	do
-		sleep "`expr 5 + ${RETR}`"
-		RETR="`expr 1 + ${RETR}`"
-		[ "${RETR}" -gt 5 ] && err "GIT pull Timeout after ${RETR} retres."
-done
-
-fi
-
-echo "Commit `git describe --match 'v*' --always`"
-echo "Done (GIT)."
-echo ""
-		;;
-esac
-#
-# END CHECKOUT
-#
-
-#
-# START PATCH
-#
-cd "${BOXDIR}/${WORKDIR}/empserver" || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver"
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*PATCH*) ;;
-	*)
-
-echo "Applying global patches from ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/All"
-for i in "${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/All"/*.patch
-do
-	[ -r "${i}" ] || continue
-	if git apply "${i}" >/dev/null
-	then
-		echo "${i}: OK"
-	else
-		echo "========== ${i}: NOT OK! ${?} =========="
-	fi
-done
-echo "Done (patch All)."
-echo ""
-
-LOCALPATCHDIRECTORY="${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/${INSTANCE}"
-if [ -n "${LOCALPATCHDIRECTORY}" -a -d "${LOCALPATCHDIRECTORY}/." ]
-then
-	echo "Applying system specific patches from ${LOCALPATCHDIRECTORY}:"
-	for i in "${LOCALPATCHDIRECTORY}"/*.patch
-	do
-		[ -r "${i}" ] || continue
-		if git apply "${i}" >/dev/null
-		then
-			echo "${i}: OK"
-		else
-			echo "========== ${i}: NOT OK! ${?} =========="
-		fi
-	done
-	echo "Done (patch specific)."
-	echo ""
-fi
-echo "Apply controlled time patch."
-for f in `git-ls-files | grep -E '\.[ch](\.in)?$' | xargs grep -l \>`
-do
- n=`grep -n '^[     ]*#[     ]*include\>' $f | tail -n 1 | sed 's/:.*//'`
-if [ $n ]
-then
-sed "$n"'a\
-#include "emptime.h"\
-#undef time\
-#define time(timer) emp_time((timer), __FUNCTION__)\
-#undef gettimeofday\
-#define gettimeofday(tv, tz) emp_gettimeofday((tv), (tz))' $f >$f.patched
-mv $f.patched $f
-fi
-done
-git add include/emptime.h src/lib/gen/emptime.c
-echo "Done applying controlled time patch."
-echo ""
-git pull --quiet
-sh ./bootstrap
-./configure --prefix ${BOXDIR}/${WORKDIR}/emp4 ${CONFIGURE_OPTIONS}
-
-		;;
-esac
-#
-# END PATCH
-#
-
-#
-# START BUILD
-#
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*BUILD*) ;;
-	*)
-
-
-# Start the build
-echo "Building server"
-if make -k install >/dev/null
-then
-	warn "make did not return 0"
-fi
-echo "Done (make)."
-echo ""
-
-		;;
-esac
-#
-# END BUILD
-#
-
-cd "${BOXDIR}/${WORKDIR}" || err "Could not cd to ${BOXDIR}/${WORKDIR}"
-# Try to run startup utilities
-for onetime in 1
-do
-	#
-	# START GENERATE
-	#
-	case "${NIGHTLY_SKIP_STEP}"
-	in
-		*GENERATE*) ;;
-		*)
-
-	if [ -d emp4 -a -d emp4/bin -a -d emp4/sbin -a -d emp4/var/empire ]
-	then
-		echo "Directory structure is ok"
-	else
-		warn "Directory structure is NOT ok"
-		break
-	fi
-
-	if [ ! -f emp4/etc/empire/schedule ]
-	then
-		warn "schedule file is missing"
-		break
-	fi
-
-	if [ ! -f emp4/etc/empire/econfig ]
-	then
-		warn "econfig file is missing"
-		break
-	fi
-
-	if ! emp4/sbin/pconfig >emp4/etc/empire/econfig
-	then
-		warn "pconfig failed to create econfig file"
-		break
-	fi
-echo "Applying global econfig patches from ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/All"
-for i in "${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/All"/*.econfig
-do
-	[ -r "${i}" ] || continue
-	if "${i}" >>emp4/etc/empire/econfig
-	then
-		echo "${i}: OK"
-	else
-		echo "========== ${i}: NOT OK! ${?} =========="
-	fi
-done
-echo "Done (econfig patch All)."
-echo ""
-
-LOCALPATCHDIRECTORY="${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/${INSTANCE}"
-if [ -n "${LOCALPATCHDIRECTORY}" -a -d "${LOCALPATCHDIRECTORY}/." ]
-then
-	echo "Applying system specific econfig patches from ${LOCALPATCHDIRECTORY}:"
-	for i in "${LOCALPATCHDIRECTORY}"/*.econfig
-	do
-		[ -r "${i}" ] || continue
-		if "${i}" >>emp4/etc/empire/econfig
-		then
-			echo "${i}: OK"
-		else
-			echo "========== ${i}: NOT OK! ${?} =========="
-		fi
-	done
-	echo "Done (econfig patch specific)."
-	echo ""
-fi
-
-	cd emp4/bin || err "Could not cd to emp4/bin"
-
-	echo "Determining type of files in bin directory"
-	file *
-	echo "Done (file *)."
-	echo ""
-
-	cd ../sbin || err "Could not cd to ../sbin"
-
-	echo "Determining type of files in sbin directory"
-	file *
-	echo "Done (file *)."
-	echo ""
-
-	echo "Running files and fairland"
-	echo y | ./files -e ../etc/empire/econfig || warn "Error running files"
-	./fairland -R 1 -e ../etc/empire/econfig 10 30 >/dev/null || { warn "Error running fairland" ; break ; }
-	[ -s "newcap_script" ] || { warn "fairland did not produce newcap_script" ; break ; }
-	echo "Done (files & fairland)."
-	echo ""
-
-			;;
-	esac
-	#
-	# END GENERATE
-	#
-
-	#
-	# START SERVERSTART
-	#
-	case "${NIGHTLY_SKIP_STEP}"
-	in
-		*SERVERSTART*) ;;
-		*)
-
-	echo "Removing existing server.log and journal.log"
-	if [ -f "../var/empire/server.log" ]
-	then
-	    rm "../var/empire/server.log"
-	fi
-	if [ -f "../var/empire/journal.log" ]
-	then
-	    rm "../var/empire/journal.log"
-	fi
-	echo "Removing existing schedule"
-	if [ -f "../etc/empire/schedule" ]
-	then
-	    >../etc/empire/schedule
-	fi
-	echo "Starting server with -d in the background"
-	./emp_server -R 1 -e ../etc/empire/econfig -d 2>/dev/null &
-	PID="$!"
-	sleep 1
-	kill -0 "${PID}" || { warn "emp_server not running ?" ; break ; }
-	echo "Done (emp_server)."
-	echo ""
-
-			;;
-	esac
-	#
-	# END SERVERSTART
-	#
-
-	#
-	# START GENERATE (2nd part)
-	#
-	case "${NIGHTLY_SKIP_STEP}"
-	in
-		*GENERATE*) ;;
-		*)
-
-export EMPIRE_PATH=${BOXDIR}/${WORKDIR}/emp4/bin
-	echo "Running newcap_script through empire"
-	runfeed POGO peter < newcap_script >/dev/null 2>&1 ||
-		{
-			warn "Could not run newcap_script"
-			echo "Stopping server"
-			trykill $PID
-			break
-		}
-	echo "Done (newcap_script / empire)."
-	echo ""
-
-			;;
-	esac
-	#
-	# END GENERATE (2nd part)
-	#
-
-	#
-	# START TESTSCRIPT
-	#
-	case "${NIGHTLY_SKIP_STEP}"
-	in
-		*TESTSCRIPT*) ;;
-		*)
-
-echo "Applying tests from ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/tests"
-cd ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/tests
-for i in *
-do
-	[ -d "$i" ] || continue
-	cd  "$i"
-	if [ "$i" -ne "00" ]
-	then
-		echo "Update Turn $i starting"
-		if ../update
-		then
-			echo "Update Turn $i completed successfully"
-		else
-			echo "Update Turn $i failed"
-		fi
-
-	fi
-	for j in *
-	do
-		[ -x "$j" ] || continue
-		echo "Player $j Turn $i starting"
-		if ./"$j"
-		then
-			echo "Player $j Turn $i completed successfully"
-		else
-			echo "Player $j Turn $i failed"
-		fi
-	done
-	cd ..
-done
-echo "Done tests."
-echo ""
-
-			;;
-	esac
-	#
-	# END TESTSCRIPT
-	#
-
-	#
-	# START SERVERSTOP
-	#
-	case "${NIGHTLY_SKIP_STEP}"
-	in
-		*SERVERSTOP*) ;;
-		*)
-			case "${NIGHTLY_SKIP_STEP}"
-			in
-				*SERVERSTART*) ;;
-				*)
-
-	echo "Stopping server"
-	trykill "${PID}"
-	echo "Done (kill)."
-cd "${BOXDIR}/${WORKDIR}/emp4/var/empire" || err "Could not cd to ${BOXDIR}/${WORKDIR}/emp4/var/empire"
-	echo "-- Start Server Log --"
-	cat server.log
-	echo "-- End of Server Log --"
-	echo "-- Start Journal Log --"
-	cat journal.log
-	echo "-- End of Journal Log --"
-	echo "Server stopped"
-					;;
-			esac
-			;;
-	esac
-	#
-	# END SERVERSTOP
-	#
-done
-
-#
-# START CLEANUP
-#
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*CLEANUP*) ;;
-	*)
-
-echo "Cleaning sandbox"
-cd "${BOXDIR}" || err "Could not cd back to sandbox root !"
-case "${NIGHTLY_SKIP_STEP}"
-in
-	*REMOVE_REPOSITORY*)
-rm -rf `find "${WORKDIR}" -maxdepth 1 ! -name .git` || warn "Directory ${WORKDIR} could not be forcibly removed !"
-		;;
-	*)
-rm -rf "${WORKDIR}" || warn "Directory ${WORKDIR} could not be forcibly removed !"
-[ -d "${WORKDIR}/." ] && warn "Directory ${WORKDIR} still present"
-		;;
-esac
-echo "Done (cleaning)."
-		;;
-esac
-#
-# END CLEANUP
-#
-
-echo "Nightly build finished at `date`"
-
-exit 0
--- a/src/scripts/nightly/patches/All/README
+++ b/src/scripts/nightly/patches/All/README
@ -1,5 +0,0 @@
-Nota Bene:
-
-The patches in these directories are executed in alphabetical order. One
-patch could influence the other, by patching the same files for
-instance.
--- a/src/scripts/nightly/patches/All/emptime.c.patch
+++ b/src/scripts/nightly/patches/All/emptime.c.patch
@ -1,115 +0,0 @@
-diff --git a/include/emptime.h b/include/emptime.h
-new file mode 100644
-index 0000000..3c1eb7b
--- /dev/null
-+++ b/include/emptime.h
-@@ -0,0 +1,43 @@
-+/*
-+ *  Empire - A multi-player, client/server Internet based war game.
-+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
-+ *                Ken Stevens, Steve McClure, Markus Armbruster
-+ *
-+ *  Empire is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *  ---
-+ *
-+ *  See files README, COPYING and CREDITS in the root of the source
-+ *  tree for related information and legal notices.  It is expected
-+ *  that future projects/authors will amend these files as needed.
-+ *
-+ *  ---
-+ *
-+ *  emptime.h: Time functions for regression testing
-+ *
-+ *  Known contributors to this file:
-+ *     Ron Koenderink, 2008
-+ *     Markus Armbruster, 2012
-+ */
-+
-+#ifndef EMPTIME_H
-+#define EMPTIME_H
-+
-+#include <sys/time.h>
-+#include <time.h>
-+
-+extern time_t emp_time(time_t *, const char []);
-+extern int emp_gettimeofday(struct timeval *, void *);
-+
-+#endif
-diff --git a/src/lib/gen/emptime.c b/src/lib/gen/emptime.c
-new file mode 100644
-index 0000000..4461093
--- /dev/null
-+++ b/src/lib/gen/emptime.c
-@@ -0,0 +1,60 @@
-+/*
-+ *  Empire - A multi-player, client/server Internet based war game.
-+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
-+ *                Ken Stevens, Steve McClure, Markus Armbruster
-+ *
-+ *  Empire is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *  ---
-+ *
-+ *  See files README, COPYING and CREDITS in the root of the source
-+ *  tree for related information and legal notices.  It is expected
-+ *  that future projects/authors will amend these files as needed.
-+ *
-+ *  ---
-+ *
-+ *  emptime.c: Time functions for regression testing
-+ *
-+ *  Known contributors to this file:
-+ *     Ron Koenderink, 2008
-+ *     Markus Armbruster, 2012
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include "emptime.h"
-+
-+static time_t now = (time_t)100L;
-+
-+time_t
-+emp_time(time_t * time_ptr, const char function[])
-+{
-+    if (strcmp(function, "update_main") == 0)
-+	now += 100L;
-+
-+    if (time_ptr != NULL)
-+	*time_ptr = now;
-+
-+    return now;
-+}
-+
-+int
-+emp_gettimeofday(struct timeval *tv, void *tz)
-+{
-+    if (tv) {
-+	tv->tv_sec = now;
-+	tv->tv_usec = 0;
-+    }
-+    return 0;
-+}
--- a/src/scripts/nightly/patches/All/journal.econfig
+++ b/src/scripts/nightly/patches/All/journal.econfig
@ -1 +0,0 @@
-echo keep_journal 1
--- a/src/scripts/nightly/patches/All/pr.c.patch
+++ b/src/scripts/nightly/patches/All/pr.c.patch
@ -1,12 +0,0 @@
-Index: empserver/src/lib/subs/pr.c
--- empserver/src/lib/subs/pr.c	18 Aug 2007 17:03:13 -0000	1.41
-+++ empserver/src/lib/subs/pr.c	9 Sep 2007 02:42:51 -0000
-@@ -351,7 +358,7 @@
- void
- prprompt(int min, int btu)
- {
-    pr_id(player, C_PROMPT, "%d %d\n", min, btu);
-+    pr_id(player, C_PROMPT, "0 640\n"); /* Hack for nightlybuild */
- }
-
- /*
--- a/src/scripts/nightly/patches/All/pre_update.econfig
+++ b/src/scripts/nightly/patches/All/pre_update.econfig
@ -1 +0,0 @@
-#echo pre_update_hook '"echo pre_update_hook executed here"'
--- a/src/scripts/nightly/patches/win32.i386/mingw.econfig
+++ b/src/scripts/nightly/patches/win32.i386/mingw.econfig
@ -1,3 +0,0 @@
-echo data "$MINGW_DIR$BOXDIR/$INSTANCE/emp4/var/empire"
-echo info "$MINGW_DIR$BOXDIR/$INSTANCE/emp4/share/empire/info.nr"
-echo builtin "$MINGW_DIR$BOXDIR/$INSTANCE/emp4/share/empire/builtin"
--- a/src/scripts/nightly/report.sh
+++ b/src/scripts/nightly/report.sh
@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# Generate report from the last two build logs
-#
-# Blame it on marcolz
-#
-
-INTERPRETER="$_"
-
-case "$INTERPRETER"
-in
-	*/ksh|ksh)
-		;;
-	*)
-		if  [ "`uname`" = "SunOS" ]
-		then
-			exec ksh "$0" "$@"
-		fi
-	;;
-esac
-
-PROGNAME="$0"
-
-usage() {
-	echo "Usage: ${PROGNAME} <configfile>" >&2;
-	exit 1;
-}
-
-[ $# -lt 1 ] && usage
-
-[ -f "$1" ] || usage
-
-# Source config file
-case "$1"
-in
-	*/*)
-		. "$1"
-		;;
-	*)
-		. ./"$1"
-		;;
-esac
-
-[ -f "${SCRIPTDIR}/common.sh" ] || { echo "Broken config ?" >&2; exit 1; }
-. "${SCRIPTDIR}"/common.sh
-
-cd "${LOGDIR}" || err "Could not cd to ${LOGDIR}"
-
-BUILDTYPE="${INSTANCE}"
-[ -n "${EXTRASUFFIX}" ] && BUILDTYPE="${BUILDTYPE}.${EXTRASUFFIX}"
-
-echo "This was generated using: ${0} ${1}"
-echo ""
-echo "Sections: <diff> <full>"
-echo ""
-echo "Environment:"
-echo "uname -a: $(uname -a)"
-echo "gcc -v: $(gcc -v 2>&1)"
-echo ""
-echo "========================================="
-echo "===== Differences since last build: ====="
-echo "========================================="
-echo ""
-diff -u `ls "${BUILDTYPE}."* | tail -2`
-echo ""
-
-echo "========================================="
-echo "================ Full log: =============="
-echo "========================================="
-echo ""
-cat `ls "${BUILDTYPE}."* | tail -1`
--- a/src/scripts/nightly/tests/00/00
+++ b/src/scripts/nightly/tests/00/00
@ -1,53 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
-xdump meta sect
-xdump meta ship
-xdump meta plane
-xdump meta land
-xdump meta nuke
-xdump meta news
-xdump meta treaty
-xdump meta trade
-xdump meta nat
-xdump meta loan
-xdump meta commodity
-xdump meta lost
-xdump meta realm
-xdump meta game
-xdump meta item
-xdump meta product
-xdump meta sect-chr
-xdump meta ship-chr
-xdump meta plane-chr
-xdump meta land-chr
-xdump meta nuke-chr
-xdump meta news-chr
-xdump meta infrastructure
-xdump meta updates
-xdump meta table
-xdump meta version
-xdump meta meta
-xdump meta sector
-xdump meta agreement-status
-xdump meta land-chr-flags
-xdump meta level
-xdump meta meta-flags
-xdump meta meta-type
-xdump meta missions
-xdump meta nation-flags
-xdump meta nation-rejects
-xdump meta nation-relationships
-xdump meta nation-status
-xdump meta nuke-chr-flags
-xdump meta packing
-xdump meta page-headings
-xdump meta plague-stages
-xdump meta plane-chr-flags
-xdump meta plane-flags
-xdump meta resources
-xdump meta retreat-flags
-xdump meta ship-chr-flags
-xdump meta treaty-flags
-xdump meta country
-EOF
--- a/src/scripts/nightly/tests/00/01
+++ b/src/scripts/nightly/tests/00/01
@ -1,55 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-xdump sect 0,0
-break
-expl c 0,0 1 uh
-expl c 2,0 1 jh
-expl c 2,0 1 uh
-expl c 2,0 1 nh
-expl c 2,0 1 bh
-expl c 0,0 1 yh
-expl c 0,0 1 gh
-expl c 0,0 1 bh
-desi * ?ne=- +
-expl c 2,0 1 njh
-expl c 2,0 1 nnh
-expl c 2,0 1 bnh
-expl c 0,0 1 bbh
-expl c 0,0 1 yyh
-expl c 0,0 1 yuh
-expl c 0,0 1 bnh
-expl c 2,0 1 yuh
-expl c 2,0 1 uuh
-expl c 2,0 1 juh
-desi * ?ne=- +
-expl c 2,0 1 nnnh
-expl c 2,0 1 nnjh
-expl c 2,0 1 njjh
-expl c 2,0 1 uujh
-expl c 0,0 1 bbnh
-expl c 0,0 1 bnnh
-expl c 0,0 1 yygh
-expl c 0,0 1 yuuh
-desi * ?ne=- +
-expl c 2,0 1 nnjjh
-desi * ?ne=- +
-expl c 2,0 1 nnjjjh
-desi * ?ne=- +
-mov u 0,0 75 jh
-demob 0:2,0 55 y
-desi 2,0 m
-mov c 0,0 600 -1,-1
-desi -1,-1 g
-mov c 0,0 275 1,-1
-mov c 2,0 274 1,-1
-desi 1,-1 m
-deliver i 2,0 230 u
-deliver i 1,-1 0 j
-dist 4,0 2,0
-thres i 2,0 1
-des 0,-2 c
-capital 0,-2
-des 0,0 g
-thres d 0,0 1
-EOF
--- a/src/scripts/nightly/tests/00/02
+++ b/src/scripts/nightly/tests/00/02
@ -1,59 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-xdump meta sect
-xdump meta ship
-xdump meta plane
-xdump meta land
-xdump meta nuke
-xdump meta news
-xdump meta treaty
-xdump meta trade
-xdump meta nat
-xdump meta loan
-xdump meta commodity
-xdump meta lost
-xdump meta realm
-xdump meta game
-xdump meta item
-xdump meta product
-xdump meta sect-chr
-xdump meta ship-chr
-xdump meta plane-chr
-xdump meta land-chr
-xdump meta nuke-chr
-xdump meta news-chr
-xdump meta infrastructure
-xdump meta updates
-xdump meta table
-xdump meta version
-xdump meta meta
-xdump meta sector
-xdump meta agreement-status
-xdump meta land-chr-flags
-xdump meta level
-xdump meta meta-flags
-xdump meta meta-type
-xdump meta missions
-xdump meta nation-flags
-xdump meta nation-rejects
-xdump meta nation-relationships
-xdump meta nation-status
-xdump meta nuke-chr-flags
-xdump meta packing
-xdump meta page-headings
-xdump meta plague-stages
-xdump meta plane-chr-flags
-xdump meta plane-flags
-xdump meta resources
-xdump meta retreat-flags
-xdump meta ship-chr-flags
-xdump meta treaty-flags
-xdump meta country
-EOF
--- a/src/scripts/nightly/tests/00/03
+++ b/src/scripts/nightly/tests/00/03
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 3 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/04
+++ b/src/scripts/nightly/tests/00/04
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 4 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/05
+++ b/src/scripts/nightly/tests/00/05
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 5 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/06
+++ b/src/scripts/nightly/tests/00/06
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 6 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/07
+++ b/src/scripts/nightly/tests/00/07
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 7 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/08
+++ b/src/scripts/nightly/tests/00/08
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/09
+++ b/src/scripts/nightly/tests/00/09
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 9 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/00/10
+++ b/src/scripts/nightly/tests/00/10
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 10 << EOF
-break
-expl c 0,0 1 uh
-desi 1,-1 +
-mov c 0,0 205 uh
-desi 1,-1 g
-cen *
-EOF
--- a/src/scripts/nightly/tests/01/01
+++ b/src/scripts/nightly/tests/01/01
@ -1,8 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-real 0 -8:12,-4:4
-cen *
-map #
-read y
-EOF
--- a/src/scripts/nightly/tests/02/01
+++ b/src/scripts/nightly/tests/02/01
@ -1,19 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-desi -1,-1 b
-mov i 2,0 200 4,0
-mov i 1,-1 4 jh
-mov c -1,-1 300 4,0
-mov c -1,-1 300 3,-1
-mov c 1,-1 175 3,-1
-deli i 2,0 0 j
-deli i 1,-1 0 j
-mov c 2,0 230 5,-1
-desi 4,0 k
-desi 3,-1 j
-dist # 5,-1
-thre h 4,0 1
-thre l 3,-1 1
-desi 5,-1 h
-EOF
--- a/src/scripts/nightly/tests/03/01
+++ b/src/scripts/nightly/tests/03/01
@ -1,31 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-cen *
-map #
-read y
-build sh 5,-1 frg
-mov l 5,-1 102 6,-2
-mov c 4,0 255 6,-2
-desi 6,-2 l
-thre l 6,-2 150
-mov c 2,0 370 -2,2
-deliver i 2,0 0 j
-deliver i 1,-1 0 j
-thres d 1,1 1
-thres o -2,2 1
-thres i 2,0 0
-thres i 1,-1 0
-desi -2,2 o
-desi 1,1 g
-thres c -1:5,-1 768
-thres c -2:4,0 768
-thres c 6,-2 250
-thres c 4,-2 300
-thres l 4,-2 100
-thres o 4,-2 50
-thres d 4,-2 10
-thres d -1,-1 50
-thres c 1,1 768
-prod *
-EOF
--- a/src/scripts/nightly/tests/03/08
+++ b/src/scripts/nightly/tests/03/08
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-cen *
-map #
-read y
-exp c 0,0 50 gyyygh
-des -7,-3 )
-lost *
-EOF
--- a/src/scripts/nightly/tests/04/01
+++ b/src/scripts/nightly/tests/04/01
@ -1,19 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-cen *
-ship *
-map #
-read y
-des 4,-2 t
-enlist 3,-1 50
-mov m 3,-1 50 5,-1
-load m 0 50
-nav 0
-j
-j
-h
-assault 11,-1 0
-25
-prod *
-EOF
--- a/src/scripts/nightly/tests/04/08
+++ b/src/scripts/nightly/tests/04/08
@ -1,8 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-cen *
-map #
-read y
-lost *
-EOF
--- a/src/scripts/nightly/tests/05/01
+++ b/src/scripts/nightly/tests/05/01
@ -1,10 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-real 0 -8:16,-4:4
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/06/01
+++ b/src/scripts/nightly/tests/06/01
@ -1,37 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-real 1 -16:24,-8:8
-convert 11,-1 76
-thres c -2,2 769
-mov c -2,2 47 0,2
-des 0:2,2 g
-thres d 0:2,2 1
-thres c 0:2,2 769
-des 3,1 g
-thres d 3,1 1
-thres c 3,1 769
-des 0,0 m
-deliver i 0,0 0 g
-thres d -1,-1 300
-thres d 0,0 0
-mov d 0,0 1 -1,-1
-thres c 0,-2 100
-thres c 4:6,-2 210
-thres c -1,-1 100
-thres i 4,0 999
-thres i 3,-1 999
-des -2,0 j
-thres c -2,0 769
-thres l -2,0 1
-bmap #1
-nav 0 njnh
-look 0
-radar 0
-radar 11,-1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/06/08
+++ b/src/scripts/nightly/tests/06/08
@ -1,34 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-exp c 0,0 1 gh
-exp c 0,0 1 yh
-exp c 0,0 1 ygh
-exp c 0,0 1 yyh
-exp c 0,0 1 yyyh
-exp c 0,0 1 yyyyh
-exp c 0,0 1 yygh
-exp c 0,0 1 yygyh
-exp c 0,0 1 yygyyh
-exp c 0,0 1 bh
-exp c 0,0 1 bgh
-exp c 0,0 1 nh
-exp c 0,0 1 njh
-exp c 0,0 1 yuh
-exp c 0,0 1 yuyh
-exp c 0,0 1 yuuh
-exp c 0,0 1 yuuyh
-exp c 2,0 1 jh
-exp c 2,0 1 jjh
-exp c 2,0 1 jjjh
-exp c 2,0 1 uh
-exp c 2,0 1 ujh
-exp c 2,0 1 ujjh
-exp c 2,0 1 uyh
-exp c 2,0 1 uuh
-exp c 2,0 1 uujh
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/07/01
+++ b/src/scripts/nightly/tests/07/01
@ -1,33 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-build bridge 5,-1 j
-explore c 5,-1 1 jh
-mov c 5,-1 76 7,-1
-thres c 7,-1 77
-dist * 5,-1
-des 1,1 m
-deliver i 1,1 0 g
-thres d 1,1 0
-mov d 1,1 1 -1,-1
-des -1,1 k
-thres h -1,1 1
-thres c -1,1 769
-des -4:-2,-2 o
-thres o -4:-2,-2 1
-thres c -4:-2,-2 769
-des 1,-3 o
-thres o 1,-3 1
-thres c 1,-3 769
-des 4:8,2 g
-thres d 4:8,2 1
-thres c 4:8,2 769
-thres c * ?c_dist=768 769
-bmap #1
-radar 11,-1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/07/08
+++ b/src/scripts/nightly/tests/07/08
@ -1,31 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des 7,-1 c
-capital 7,-1
-des * ?gold>1 g
-thres d * ?newdes=g 1
-thres d * ?des=g 1
-thres d 4,0 0
-thres d 1,-1 1
-des -5,-3 o
-thres o -5,-3 1
-des -6,-4 o
-thres o -6,-4 1
-des 1,-1 m
-thres i 1,-1 1
-des 3,1 w
-dist * 3,1
-thres c 0:2,0 769
-thres c 1,-1 769
-thres c 4,0 350
-thres c 3,-1 769
-mov c 2,0 231 jh
-mov c 0,0 231 jjh
-mov c 1,-1 231 jh
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/08/01
+++ b/src/scripts/nightly/tests/08/01
@ -1,32 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-des 0,2 m
-deliver i 0,2 0 j
-thres d 0,2 0
-mov d 0,2 1 -1,-1
-des 3,1 m
-deliver i 3,1 0 j
-thres d 3,1 0
-mov d 3,1 1 -1,-1
-des 2,2 k
-thres h 2,2 1
-thres d 2,2 0
-mov d 2,2 1 -1,-1
-thres d 4,-2 15
-thres o 4,-2 75
-thres l 4,-2 150
-des 5:7,1 g
-thres d 5:7,1 1
-thres c 5:7,1 769
-des 10,2 g
-thres d 10,2 1
-thres c 10,2 769
-radar 11,-1
-bmap #1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/08/08
+++ b/src/scripts/nightly/tests/08/08
@ -1,12 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-thres c -3:-1,-1 769
-des 0:2,0 m
-thres i 0:2,0 1
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/09/01
+++ b/src/scripts/nightly/tests/09/01
@ -1,19 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-mov u 2,0 10 7,-1
-des -2,2 i
-thres l -2,2 600
-thres h -2,2 300
-thres s -2,2 1
-thres o -2,2 0
-mov o -2,2 1 4,-2
-thres c * ?des#= 769
-thres c -1:1,3 100
-bmap #1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/09/08
+++ b/src/scripts/nightly/tests/09/08
@ -1,24 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-thres d 1,-1 0
-mov d 1,-1 1 4,0
-des 3,-1 m
-thres i 3,-1 1
-thres d 3,-1 0
-mov d 3,-1 1 4,0
-thres c -6,-4 769
-thres c 6,-2 769
-thres c 1,-3 769
-des 4,0 b
-thres d 4,0 300
-thres d 0:2,0 0
-mov d 0,0 1 4,0
-mov d 2,0 1 4,0
-thres i -3,-1 999
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/10/01
+++ b/src/scripts/nightly/tests/10/01
@ -1,54 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-mov h 5,-1 100 7,-1
-build bridge 7,-1 j
-explore c 7,-1 1 jh
-thres c 9,-1 77
-mov u 7,-1 12 4,0
-thres u 2,0 579
-thres u 4,0 869
-thres i 4,0 1200
-thres u 11,-1 1
-thres l 6,-2 250
-des 7,1 d
-thres l 7,1 200
-thres h 7,1 100
-thres o 7,1 20
-thres g 7,1 1
-thres d 7,1 0
-mov d 7,1 1 -1,-1
-des 5,1 j
-thres l 5,1 1
-thres d 5,1 0
-mov d 5,1 1 -1,-1
-des 4,2 r
-thres l 4,2 100
-thres o 4,2 50
-thres d 4,2 10
-des 6,2 w
-thres d 6,2 0
-mov d 6,2 1 -1,-1
-des 8,2 e
-thres d 8,2 0
-mov d 8,2 1 -1,-1
-thres m 8,2 1
-des 10,2 !
-thres l 10,2 200
-thres h 10,2 200
-thres s 10,2 200
-thres g 10,2 25
-thres d 10,2 0
-mov d 10,2 1 -1,-1
-des 5,3 p
-thres l 5,3 75
-dist #1 5,-1
-thres c -1:1,3 769
-spy 11,-1
-bmap #1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/10/08
+++ b/src/scripts/nightly/tests/10/08
@ -1,18 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des -3,-1 j
-thres i -3,-1 999
-thres l -3,-1 1
-thres c 6,0 769
-thres d -3,-1 0
-mov d -3,-1 1 4,0
-thres l 1,-3 300
-thres i -1,1 999
-thres i 0,-4 999
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/11/01
+++ b/src/scripts/nightly/tests/11/01
@ -1,18 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-thres l 6,-2 300
-thres l 5,-1 200
-thres h 5,-1 200
-thres i 5,-1 1
-thres o 5,-1 1
-thres d 5,-1 1
-dist #1 6,2
-build l 10,2 cav
-bmap #1
-cen *
-ship *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/11/08
+++ b/src/scripts/nightly/tests/11/08
@ -1,27 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des -1,-1 m
-thres i -1,-1 1
-thres d -1,-1 0
-mov d -1,-1 1 4,0
-des 1,-3 l
-des -1,1 j
-thres l -1,1 1
-des 0,-4 k
-thres h 0,-4 1
-thres d 1,-3 0
-thres l 6,-2 300
-thres o 6,-2 150
-thres d 6,-2 30
-thres l 8,0 600
-thres h 8,0 300
-thres c -3:-1,1 769
-thres c 0,-4 769
-thres c 8,0 769
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/12/01
+++ b/src/scripts/nightly/tests/12/01
@ -1,16 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-build l 10,2 cav 5
-build sh 5,-1 cs 3
-thres m 10,2 25
-thres i -4:-2,-2 999
-thres i 1,-3 999
-bmap #1
-cen *
-ship *
-land *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/12/08
+++ b/src/scripts/nightly/tests/12/08
@ -1,21 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des 6,-2 t
-des 6,0 h
-thres d 6,0 0
-thres l 6,0 200
-thres h 6,0 200
-des 8,0 i
-thres s 8,0 1
-thres c 4,0 400
-thres c -2:4,-2 769
-thres i 4,-2 999
-des 4,-2 j
-thres i -3,1 999
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/13/01
+++ b/src/scripts/nightly/tests/13/01
@ -1,62 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-des -2,-2 j
-thres l -2,-2 1
-des -4,-2 k
-thres h -4,-2 1
-thres o -4:-2,-2 0
-des 1,-3 j
-thres l 1,-3 1
-thres o 1,-3 0
-des -1,3 o
-thres o -1,3 1
-des 2,2 m
-thres i 2,2 1
-thres h 2,2 0
-des 3,-1 m
-thres l 3,-1 0
-thres i 3,-1 1
-thres l 6,-2 400
-radar 11,-1
-lload m 0 20
-lload m 1/2/3 1
-march 0/1/2/3 5,-1
-load m 1 25
-load c 1 300
-load l 1 100
-load h 1 100
-load c 2 10
-load c 3 10
-load land 1 0
-load land 2 1
-load land 3 2
-load land 3 3
-build l 10,2 art
-nav 2 nh
-scrap l 1
-y
-scrap s 2
-y
-scuttle l 1
-y
-scuttle s 2
-y
-comm 5,-1
-scrap l 2
-y
-comm 5,-1
-scrap s 3
-y
-comm 5,-1
-thres i 5,-1 0
-thres d 5,-1 0
-thres o 5,-1 0
-bmap #1
-cen *
-ship *
-land *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/13/02
+++ b/src/scripts/nightly/tests/13/02
@ -1,93 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
-explore c 2,0  1 uh
-explore c 2,0  1 jh
-explore c 2,0  1 bh
-explore c 2,0  1 nh
-des * ?des=- +
-explore c 2,0  1 yuh
-explore c 2,0  1 ygh
-explore c 2,0  1 juh
-explore c 2,0  1 ggh
-explore c 2,0  1 bgh
-explore c 2,0  1 bbh
-explore c 2,0  1 bnh
-des * ?des=- +
-explore c 2,0  1 jujh
-explore c 2,0  1 gggh
-explore c 2,0  1 bggh
-explore c 2,0  1 bbgh
-explore c 2,0  1 bbbh
-explore c 2,0  1 bbnh
-explore c 2,0  1 bnnh
-des * ?des=- +
-explore c 2,0  1 gggyh
-explore c 2,0  1 ggggh
-explore c 2,0  1 bgggh
-explore c 2,0  1 bbggh
-explore c 2,0  1 bbbgh
-des * ?des=- +
-explore c 2,0  1 gggyuh
-des * ?des=- +
-explore c 0,0  1 yh
-explore c 0,0  1 gh
-explore c 0,0  1 bh
-explore c 0,0  1 nh
-des * ?des=- +
-explore c 0,0  1 uuh
-explore c 0,0  1 juh
-explore c 0,0  1 ggh
-explore c 0,0  1 jjh
-explore c 0,0  1 bgh
-explore c 0,0  1 jnh
-explore c 0,0  1 bbh
-explore c 0,0  1 bnh
-explore c 0,0  1 nnh
-des * ?des=- +
-explore c 0,0  1 ggyh
-explore c 0,0  1 jjuh
-explore c 0,0  1 gggh
-explore c 0,0  1 bggh
-explore c 0,0  1 bbgh
-explore c 0,0  1 bbbh
-explore c 0,0  1 bbnh
-explore c 0,0  1 bnnh
-explore c 0,0  1 nnnh
-des * ?des=- +
-explore c 0,0  1 ggyyh
-explore c 0,0  1 ggyuh
-explore c 0,0  1 ggygh
-explore c 0,0  1 jjujh
-explore c 0,0  1 bgggh
-des * ?des=- +
-designate 2,-2 c
-capital 2,-2
-des * ?gold>10 g
-thres d * ?gold>10 1
-des  -1,-1 o
-thres o -1,-1 1
-des 1,-1 b
-thres d 1,-1 300
-thres c * ?des#+ 769
-thres c -4,-2 230
-thres c 2,-2 50
-thres c 1,-1 385
-thres c 3,-1 300
-thres c 5,-1 600
-des -4,-2 w
-distr * 1,-1
-mov c 1,1 231 -4,-2
-demob 0:2,0 55
-y
-mov c 0,0 260 3,-1
-mov c 2,0 165 3,-1
-mov c 2,0 100 5,-1
-thres u 0:2,0 579
-thres u -5,-1 579
-bmap #1
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/13/08
+++ b/src/scripts/nightly/tests/13/08
@ -1,23 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-thres c -2,0 769
-thres c 1,1 769
-thres c 5,-1 769
-thres c -5,-3 769
-thres c -4,-2 769
-thres c -1,-3 769
-thres u -1:3,-1 512
-thres u 0:2,0 512
-thres d -3,1 0
-thres l -3,1 1
-thres i 2,-2 999
-des 2,-2 k
-thres h 2,-2 1
-des -3,1 j
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/14/01
+++ b/src/scripts/nightly/tests/14/01
@ -1,30 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-lload m 4/5 5
-lload s 5 200
-lload g 5 20
-march 4/5 ggyyh
-thres l 6,-2 450
-des 11,-1 *
-thres l 11,-1 200
-thres h 11,-1 200
-thres p 11,-1 200
-thres u 3:5,1 579
-des 2,-2 o
-build s 5,-1 tk
-load c 2 200
-telegram 2
-Want an alliance?
-.
-declare war 8
-declare alliance 2
-bmap #1
-cen *
-ship *
-land *
-plane *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/14/02
+++ b/src/scripts/nightly/tests/14/02
@ -1,25 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
-des 0:2,0 m
-thres i 0:2,0 1
-thres i -5,-1 999
-dist * -4,-2
-thres o 4,0 1
-wall
-Sure
-.
-declare alliance 1
-declare hostile 8
-wire y
-announce
-Hello World
-.
-wire y
-flash 1 Testing Flash
-bmap #1
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/14/08
+++ b/src/scripts/nightly/tests/14/08
@ -1,20 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-thres c * 769
-thres i -2:0,-2 1
-des -2:0,-2 m
-thres d -2:2,-2 0
-thres o 5,-1 10
-thres l 5,-1 50
-thres h 5,-1 100
-thres h -6,-4 100
-declare war 1
-declare hostile 2
-wire y
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/15/01
+++ b/src/scripts/nightly/tests/15/01
@ -1,26 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-build p 11,-1 f1 3
-thres s 11,-1 200
-thres p 11,-1 200
-des 2,-2 %
-thres p 2,-2 1
-thres s 5,-1 200
-thres g 5,-1 10
-thres d -1,-1 0
-thres c * 0
-march 4/5 ujjjh
-build s 5,-1 od
-load c 3 200
-build s 5,-1 ft
-load c 4 200
-bmap #1
-cen *
-ship *
-land *
-plane *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/15/02
+++ b/src/scripts/nightly/tests/15/02
@ -1,15 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
-des -5,-1 j
-thres l -5,-1 1
-thres l 3,-1 300
-thres c 5,-1 769
-thres i 5,-1 999
-thres c 7,-1 400
-bmap #1
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/15/08
+++ b/src/scripts/nightly/tests/15/08
@ -1,33 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des 5,-1 d
-thres g 5,-1 1
-des -6,-4 f
-thres g -6,-4 7
-thres s -6,-4 200
-des -4,-2 *
-thres l -4,-2 200
-thres h -4,-2 200
-thres s -4,-2 200
-thres d -4,-2 0
-des -1,-3 !
-thres l -1,-3 200
-thres h -1,-3 200
-thres s -1,-3 200
-thres g -1,-3 10
-thres d -1,-3 0
-des -2,0 p
-thres d -2,0 0
-thres l -2,0 75
-des 1,1 k
-thres i 1,1 999
-thres h 1,1 1
-thres l 1,-3 400
-mov m 0,0 55 -6,-4
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/16/01
+++ b/src/scripts/nightly/tests/16/01
@ -1,37 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
-mov c 1,-1 230 jjh
-mov c 3,-1 230 jh
-mov c 2,-2 230 njh
-mov c 4,-2 230 nh
-mov c 6,-2 230 bh
-load c 3/4 999
-nav 3 6,0
-h
-nav 3 vh
-order 3 des 5,-1 6,0
-order 3 level 1 end oil 1
-nav 4 nvh
-order 4 des 5,-1 6,0
-order 4 level 1 start food 30
-order 4 level 1 end food 30
-reco 0 . 11,-1 ujbgh
-bomb 1 . stat 11,-1 ujh
-mission p 2 o . 2
-fire l 5 12,-2
-attack 12,-2 0 0 0 0
-0
-N
-attack 12,-2
-1
-y
-bmap #1
-cen *
-ship *
-land *
-plane *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/16/02
+++ b/src/scripts/nightly/tests/16/02
@ -1,20 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
-des 3,-1 l
-thres d 3,-1 0
-des 5,-1 k
-thres d 5,-1 0
-thres h 5,-1 1
-thres c 7,-1 769
-thres i 7,-1 999
-thres l -6,0 300
-thres o -6,0 150
-thres d -6,0 30
-thres c -6,0 400
-bmap #1
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/16/08
+++ b/src/scripts/nightly/tests/16/08
@ -1,12 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
-des -4,-4 o
-thres o -4,-4 1
-thres o -5,-3 0
-bmap #
-cen *
-map #
-read y
-prod *
-EOF
--- a/src/scripts/nightly/tests/99/00
+++ b/src/scripts/nightly/tests/99/00
@ -1,53 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
-xdump sect 0,0
-xdump ship *
-xdump plane *
-xdump land *
-xdump nuke *
-xdump news *
-xdump treaty *
-xdump trade *
-xdump nat *
-xdump loan *
-xdump commodity *
-xdump lost *
-xdump realm 0
-xdump game *
-xdump item *
-xdump product *
-xdump sect-chr *
-xdump ship-chr *
-xdump plane-chr *
-xdump land-chr *
-xdump nuke-chr *
-xdump news-chr *
-xdump infrastructure *
-xdump updates *
-xdump table *
-xdump version *
-xdump meta *
-xdump sector *
-xdump agreement-status *
-xdump land-chr-flags *
-xdump level *
-xdump meta-flags *
-xdump meta-type *
-xdump missions *
-xdump nation-flags *
-xdump nation-rejects *
-xdump nation-relationships *
-xdump nation-status *
-xdump nuke-chr-flags *
-xdump packing *
-xdump page-headings *
-xdump plague-stages *
-xdump plane-chr-flags *
-xdump plane-flags *
-xdump resources *
-xdump retreat-flags *
-xdump ship-chr-flags *
-xdump treaty-flags *
-xdump country *
-EOF
--- a/src/scripts/nightly/tests/99/01
+++ b/src/scripts/nightly/tests/99/01
@ -1,53 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 1 << EOF
-xdump sect 0,0
-xdump ship *
-xdump plane *
-xdump land *
-xdump nuke *
-xdump news *
-xdump treaty *
-xdump trade *
-xdump nat *
-xdump loan *
-xdump commodity *
-xdump lost *
-xdump realm *
-xdump game *
-xdump item *
-xdump product *
-xdump sect-chr *
-xdump ship-chr *
-xdump plane-chr *
-xdump land-chr *
-xdump nuke-chr *
-xdump news-chr *
-xdump infrastructure *
-xdump updates *
-xdump table *
-xdump version *
-xdump meta *
-xdump sector *
-xdump agreement-status *
-xdump land-chr-flags *
-xdump level *
-xdump meta-flags *
-xdump meta-type *
-xdump missions *
-xdump nation-flags *
-xdump nation-rejects *
-xdump nation-relationships *
-xdump nation-status *
-xdump nuke-chr-flags *
-xdump packing *
-xdump page-headings *
-xdump plague-stages *
-xdump plane-chr-flags *
-xdump plane-flags *
-xdump resources *
-xdump retreat-flags *
-xdump ship-chr-flags *
-xdump treaty-flags *
-xdump country *
-EOF
--- a/src/scripts/nightly/tests/update
+++ b/src/scripts/nightly/tests/update
@ -1,11 +0,0 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
-power new
-report *
-cen * ?own#0
-comm * ?own#0
-reso * ?own#0
-force
-EOF
-sleep 10
				`@ -1 +0,0 @@`
				`#echo pre_update_hook '"echo pre_update_hook executed here"'`