tests: Define and use some abbreviations

No functional change.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/actofgod-test b/tests/actofgod-test
index f5d3e8e4c6ea83503852dbd5a5b5be05c1b5a6ff..a1a5e1760ee45711611bc37bfee3004fbc9fb0cb 100755 (executable)
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox

-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF

 WORLD_X 24
 WORLD_Y 16
 GODNEWS 1
 WORLD_X 24
 WORLD_Y 16
 GODNEWS 1


@@ -22,4 +22,4 @@ perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
 
 end_test
 
 
 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 28575cf4b4aa5c8c9fdfa33c375cdf59d9a54b48..50881e2674e117d881f1e2ff7b543233a4b6990d 100755 (executable)
--- a/tests/bridgefall-test
+++ b/tests/bridgefall-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox

-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF

 WORLD_X 20
 WORLD_Y 10
 BRIDGETOWERS 1
 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
 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
 
 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 c6b2eb1f64e1f09f3382fe124920c10512336cb0..3997e2190159901e3d65d2d7a9e2bcf51925b937 100755 (executable)
--- a/tests/build-test
+++ b/tests/build-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox

-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF

 WORLD_X 20
 WORLD_Y 12
 BRIDGETOWERS 1
 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
 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
 EASY_BRIDGES 0
 BRIDGETOWERS 0
 EOF


@@ -29,4 +29,4 @@ start_server
 feed_dir "$srcdir"/tests/build/bridges-2
 end_test
 
 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 9a7cfbc50715bc594d65d9a4f5a958d3f5931dd9..e3427168349b12ac8af052e9c59cfbd9808fee7b 100755 (executable)
--- a/tests/fairland-test
+++ b/tests/fairland-test
@@ -13,11 +13,11 @@ create_sandbox
 
 exec 3>sandbox/fairland.out
 
 
 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>&-
 
 
 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
 
 cmp_out fairland.out final.xdump newcap_script

diff --git a/tests/files-test b/tests/files-test
index 4be9990dea42b11b8042a3cd91b46bf9a88e7d79..3343ed7ed7aae7fc1fe1a49a77def5822e8397fe 100755 (executable)
--- a/tests/files-test
+++ b/tests/files-test
@@ -13,10 +13,10 @@ create_sandbox
 
 exec 3>sandbox/files.out
 
 
 exec 3>sandbox/files.out
 

-src/util/files -e sandbox/etc/empire/econfig -f >&3
+$files -f >&3

 
 exec 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
 
 cmp_out files.out final.xdump

diff --git a/tests/fire-test b/tests/fire-test
index 4a76b697724a90a086f3a2384f4384eca383aa1e..7dc094b00cce8b40704975756ef535f16fb89346 100755 (executable)
--- a/tests/fire-test
+++ b/tests/fire-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
 . "$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
 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
 
 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 8544b20e3b0a3f4a2d4cc03f219c27ad6d4f6807..d84faf3e4421f43f470edb5f38cba70bae078300 100755 (executable)
--- a/tests/info-test
+++ b/tests/info-test
@@ -11,7 +11,7 @@ srcdir="$1"
 
 create_sandbox
 # Suppress test-only commands:
 
 create_sandbox
 # Suppress test-only commands:

-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF

 running_test_suite 0
 EOF
 
 running_test_suite 0
 EOF
 


@@ -44,7 +44,7 @@ EOF
 
 end_test
 
 
 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
 then echo "Command documentation OK"
 else echo "Command documentation FAIL"; false
 fi

diff --git a/tests/retreat-test b/tests/retreat-test
index b0d1ce8dfbeb6511dd156a67bf6cdb769514156d..4cfeb5baba74a4e9d067ca353f74c724d1ceba28 100755 (executable)
--- a/tests/retreat-test
+++ b/tests/retreat-test
@@ -10,7 +10,7 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox

-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF

 WORLD_X 24
 WORLD_Y 12
 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
 
 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 1308b2cb7a4a26a7eca95f4deea036b591e20fb3..682d03b857da2192b21164fa20b3fae6400a0650 100755 (executable)
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -18,4 +18,4 @@ feed_dir "$srcdir"/tests/smoke
 
 end_test
 
 
 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 6a5d564ae16a6e12d90e0d2b3e64c93a292b8bf7..eec7b43cb763201d8cc319f9277ee78065e90441 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -8,6 +8,15 @@ fi
 test=${0##*/}
 test=${test%-test}
 
 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
 
 empthread=`sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile`
 warn_empthread=y
 


@@ -23,9 +32,9 @@ check_empthread()
 create_sandbox()
 {
     rm -rf sandbox
 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"
 data "../../var/empire"
 info "../../../../info.nr"
 builtin "../../share/empire/builtin"


@@ -45,7 +54,7 @@ now()
 
 start_server()
 {
 
 start_server()
 {

-    local pidfile=sandbox/var/empire/server.pid
+    local pidfile=$data/server.pid

     local timeout
 
     #
     local timeout
 
     #


@@ -64,7 +73,7 @@ start_server()
 
     pid=
     trap 'if [ "$pid" ]; then kill -9 "$pid" 2>/dev/null || true; fi' EXIT
 
     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
     timeout=$((`now`+5))
     until pid=`cat $pidfile 2>/dev/null` && [ -n "$pid" ]
     do


@@ -124,18 +133,18 @@ feed_dir()
 
 begin_test()
 {
 
 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"
     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
        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
        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
        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
 }
     fi
     start_server
 }


@@ -158,7 +167,12 @@ begin_test()
 end_test ()
 {
     stop_server
 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()
 }
 
 cmp_out()


@@ -171,7 +185,7 @@ cmp_out()
        */server.log)   opt=-s ;;
        *)              opt= ;;
        esac
        */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"
        act="sandbox/$i"
        nrm="sandbox/normalized-${i##*/}"
        perl "$srcdir"/tests/normalize.pl $opt "$act" >"$nrm"