From 9f33eb1ba8be8016883b8c2ee0b1c6af24f07e3f Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 28 Jan 2014 19:29:11 +0100
Subject: [PATCH] tests: Define and use some abbreviations

No functional change.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---
 tests/actofgod-test   |  4 ++--
 tests/bridgefall-test |  6 +++---
 tests/build-test      |  6 +++---
 tests/fairland-test   |  6 +++---
 tests/files-test      |  4 ++--
 tests/fire-test       |  4 ++--
 tests/info-test       |  4 ++--
 tests/retreat-test    |  4 ++--
 tests/smoke-test      |  2 +-
 tests/test-common.sh  | 50 +++++++++++++++++++++++++++----------------
 10 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/tests/actofgod-test b/tests/actofgod-test
index f5d3e8e4c..a1a5e1760 100755
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 24
 WORLD_Y 16
 GODNEWS 1
@@ -22,4 +22,4 @@ perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
 
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/bridgefall-test b/tests/bridgefall-test
index 28575cf4b..50881e267 100755
--- a/tests/bridgefall-test
+++ b/tests/bridgefall-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 20
 WORLD_Y 10
 BRIDGETOWERS 1
@@ -19,11 +19,11 @@ EOF
 begin_test "$srcdir"/tests/bridgefall/setup-POGO
 feed_dir "$srcdir"/tests/bridgefall/easy-on
 stop_server
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 EASY_BRIDGES 0
 EOF
 start_server
 feed_dir "$srcdir"/tests/bridgefall/easy-off
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/build-test b/tests/build-test
index c6b2eb1f6..3997e2190 100755
--- a/tests/build-test
+++ b/tests/build-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 20
 WORLD_Y 12
 BRIDGETOWERS 1
@@ -21,7 +21,7 @@ begin_test "$srcdir"/tests/build/setup-POGO
 feed_dir "$srcdir"/tests/build/units
 feed_dir "$srcdir"/tests/build/bridges-1
 stop_server
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 EASY_BRIDGES 0
 BRIDGETOWERS 0
 EOF
@@ -29,4 +29,4 @@ start_server
 feed_dir "$srcdir"/tests/build/bridges-2
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/fairland-test b/tests/fairland-test
index 9a7cfbc50..e34271683 100755
--- a/tests/fairland-test
+++ b/tests/fairland-test
@@ -13,11 +13,11 @@ create_sandbox
 
 exec 3>sandbox/fairland.out
 
-src/util/files -e sandbox/etc/empire/econfig -f >&3
-src/util/fairland -e sandbox/etc/empire/econfig -s sandbox/newcap_script -R 1 10 30 >&3
+$files -f >&3
+$fairland -s sandbox/newcap_script -R 1 10 30 >&3
 
 exec 3>&-
 
-src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump
+$empdump -x >sandbox/final.xdump
 
 cmp_out fairland.out final.xdump newcap_script
diff --git a/tests/files-test b/tests/files-test
index 4be9990de..3343ed7ed 100755
--- a/tests/files-test
+++ b/tests/files-test
@@ -13,10 +13,10 @@ create_sandbox
 
 exec 3>sandbox/files.out
 
-src/util/files -e sandbox/etc/empire/econfig -f >&3
+$files -f >&3
 
 exec 3>&-
 
-src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump
+$empdump -x >sandbox/final.xdump
 
 cmp_out files.out final.xdump
diff --git a/tests/fire-test b/tests/fire-test
index 4a76b6977..7dc094b00 100755
--- a/tests/fire-test
+++ b/tests/fire-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 32
 WORLD_Y 16
 EASY_BRIDGES 1
@@ -20,4 +20,4 @@ begin_test "$srcdir"/tests/fire/setup-POGO
 feed_dir "$srcdir"/tests/fire
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/info-test b/tests/info-test
index 8544b20e3..d84faf3e4 100755
--- a/tests/info-test
+++ b/tests/info-test
@@ -11,7 +11,7 @@ srcdir="$1"
 
 create_sandbox
 # Suppress test-only commands:
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 running_test_suite 0
 EOF
 
@@ -44,7 +44,7 @@ EOF
 
 end_test
 
-if perl $srcdir/tests/info/cmp-toc-vs-lists.pl info/toc sandbox/*.list
+if perl $testdir/cmp-toc-vs-lists.pl info/toc sandbox/*.list
 then echo "Command documentation OK"
 else echo "Command documentation FAIL"; false
 fi
diff --git a/tests/retreat-test b/tests/retreat-test
index b0d1ce8df..4cfeb5bab 100755
--- a/tests/retreat-test
+++ b/tests/retreat-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 24
 WORLD_Y 12
 EOF
@@ -19,4 +19,4 @@ begin_test "$srcdir"/tests/retreat/setup-POGO
 feed_dir "$srcdir"/tests/retreat
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/smoke-test b/tests/smoke-test
index 1308b2cb7..682d03b85 100755
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -18,4 +18,4 @@ feed_dir "$srcdir"/tests/smoke
 
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log final.xdump
+cmp_logs_xdump
diff --git a/tests/test-common.sh b/tests/test-common.sh
index 6a5d564ae..eec7b43cb 100644
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -8,6 +8,15 @@ fi
 test=${0##*/}
 test=${test%-test}
 
+# Abbreviations
+testdir="$srcdir/tests/$test"
+econfig=sandbox/etc/empire/econfig
+schedule=sandbox/etc/empire/schedule
+data=sandbox/var/empire
+empdump="src/util/empdump -e $econfig"
+files="src/util/files -e $econfig"
+fairland="src/util/fairland -e $econfig"
+
 empthread=`sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile`
 warn_empthread=y
 
@@ -23,9 +32,9 @@ check_empthread()
 create_sandbox()
 {
     rm -rf sandbox
-    mkdir -p sandbox/etc/empire sandbox/share/empire/builtin sandbox/var/empire
-    touch sandbox/etc/empire/schedule
-    cat >sandbox/etc/empire/econfig <<EOF
+    mkdir -p sandbox/etc/empire sandbox/share/empire/builtin $data
+    touch $schedule
+    cat >$econfig <<EOF
 data "../../var/empire"
 info "../../../../info.nr"
 builtin "../../share/empire/builtin"
@@ -45,7 +54,7 @@ now()
 
 start_server()
 {
-    local pidfile=sandbox/var/empire/server.pid
+    local pidfile=$data/server.pid
     local timeout
 
     #
@@ -64,7 +73,7 @@ start_server()
 
     pid=
     trap 'if [ "$pid" ]; then kill -9 "$pid" 2>/dev/null || true; fi' EXIT
-    src/server/emp_server -e sandbox/etc/empire/econfig -R 1 -s -E crash-dump
+    src/server/emp_server -e $econfig -R 1 -s -E crash-dump
     timeout=$((`now`+5))
     until pid=`cat $pidfile 2>/dev/null` && [ -n "$pid" ]
     do
@@ -124,18 +133,18 @@ feed_dir()
 
 begin_test()
 {
-    src/util/files -e sandbox/etc/empire/econfig -f >/dev/null
+    $files -f >/dev/null
     local xd=
     case "$1" in
     *.xdump)
 	xd="$1"
-	src/util/empdump -e sandbox/etc/empire/econfig -i "$xd"
+	$empdump -i "$xd"
 	shift
 	;;
     esac
     if [ -z "$xd" ] || [ "$#" -ne 0 ]
     then
-	cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel
+	cp -r $data/tel $data/empty.tel
 	start_server
 	if [ "$#" -eq 0 ]
 	then feed_input POGO peter
@@ -143,14 +152,14 @@ begin_test()
 	fi
 	echo 'edit c * ?tgms>0 t 0' | feed_input POGO peter
 	stop_server
-	mv sandbox/var/empire/tel sandbox/var/empire/setup.tel
-	mv sandbox/var/empire/empty.tel sandbox/var/empire/tel
-	mv sandbox/var/empire/news sandbox/var/empire/setup.news
-	>sandbox/var/empire/news
-	mv sandbox/var/empire/lostitems sandbox/var/empire/setup.lostitems
-	>sandbox/var/empire/lostitems
-	mv sandbox/var/empire/journal.log sandbox/var/empire/setup.journal.log
-	mv sandbox/var/empire/server.log sandbox/var/empire/setup.server.log
+	mv $data/tel $data/setup.tel
+	mv $data/empty.tel $data/tel
+	mv $data/news $data/setup.news
+	>$data/news
+	mv $data/lostitems $data/setup.lostitems
+	>$data/lostitems
+	mv $data/journal.log $data/setup.journal.log
+	mv $data/server.log $data/setup.server.log
     fi
     start_server
 }
@@ -158,7 +167,12 @@ begin_test()
 end_test ()
 {
     stop_server
-    src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump
+    $empdump -x >sandbox/final.xdump
+}
+
+cmp_logs_xdump()
+{
+    cmp_out var/empire/server.log var/empire/journal.log final.xdump
 }
 
 cmp_out()
@@ -171,7 +185,7 @@ cmp_out()
 	*/server.log)	opt=-s ;;
 	*)		opt= ;;
 	esac
-	exp="$srcdir/tests/$test/${i##*/}"
+	exp="$testdir/${i##*/}"
 	act="sandbox/$i"
 	nrm="sandbox/normalized-${i##*/}"
 	perl "$srcdir"/tests/normalize.pl $opt "$act" >"$nrm"
-- 
2.43.0