client: Unbreak standalone build

[empserver] / tests / test-common.sh

diff --git a/tests/test-common.sh b/tests/test-common.sh
index e61e58fc64281ba87c43c1db29886e9a03792af3..8dbcb2b27eedb777a7ad020bbe4a52018b5ba19d 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -20,6 +20,11 @@ empdump="src/util/empdump -e $econfig"
 files="src/util/files -e $econfig"
 fairland="src/util/fairland -e $econfig"
 
+# GNU libc memory allocation checking, see mallopt(3)
+# $RANDOM isn't portable
+malloc_perturb=${EMPIRE_CHECK_MALLOC_PERTURB:-$(perl -e 'print int(rand(255))')}
+env="MALLOC_CHECK_=3 MALLOC_PERTURB_=$malloc_perturb"
+
 empthread=`sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile`
 warn_empthread=y
 
@@ -36,6 +41,7 @@ create_sandbox()
 {
     rm -rf sandbox
     mkdir -p sandbox/etc/empire sandbox/share/empire/builtin $data
+    echo $malloc_perturb >sandbox/malloc-perturb
     touch $schedule
     cat >$econfig <<EOF
 data "../../var/empire"
@@ -61,9 +67,11 @@ copy_tables()
 # sed -i isn't portable...
 sed_i()
 {
-    sed "$@" >sandbox/$$
-    shift $(($#-1))
-    mv sandbox/$$ "$1"
+    local script="$1"
+    shift
+    for i
+    do sed "$script" "$i" >sandbox/$$ && mv sandbox/$$ "$i"
+    done
 }
 
 customize()
@@ -74,8 +82,11 @@ customize()
        case $key in
        big-city)
            copy_tables sect
-           sed_i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
+           sed_i '/"c" .* "capital"/d;/^#.*"c" .* "city"/s/^#/ /;/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
            ;;
+       trade-ship)
+           copy_tables ship
+           sed_i '/"ts   trade ship"//^#/ /' sandbox/etc/empire/ship.config
        esac
     done
     echo "custom_tables \"`cd sandbox/etc/empire && echo *.config`\"" >>$econfig
@@ -92,7 +103,7 @@ run()
     local name=$1 ret
     shift
     set +e
-    "$@" >>sandbox/$name.out 2>>sandbox/$name.err
+    env $env "$@" >>sandbox/$name.out 2>>sandbox/$name.err
     ret=$?
     set -e
     echo $ret >>sandbox/$name.status
@@ -124,7 +135,7 @@ start_server()
     check_empthread
 
     pid=
-    src/server/emp_server -e $econfig -R 1 -s -E crash-dump
+    env $env 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
@@ -272,7 +283,8 @@ normalize()
 
 cmp_out1()
 {
-    local i=$1 exp="${2-$testdir/${1##*/}}"
+    local i=$1 master="${2-$testdir/${1##*/}}"
+    local exp="$master"
     local act="sandbox/$i"
     local nrm="sandbox/normalized-${i##*/}"
 
@@ -287,8 +299,6 @@ cmp_out1()
            [ ! -e "$act" ] && return
            exp=/dev/null
            ;;
-           *.status)   exp=sandbox/ok.status; echo 0 >sandbox/ok.status ;;
-           *)          exp=/dev/null ;;
        esac
     fi
 
@@ -299,7 +309,7 @@ cmp_out1()
     elif [ "$EMPIRE_CHECK_ACCEPT" ]
     then
        echo "$i CHANGED"
-       cp "$nrm" "$exp"
+       cp "$nrm" "$master"
     else
        failed=y
        echo "$i FAIL"