client: Unbreak standalone build

[empserver] / tests / test-common.sh

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 7d14039984bee39e6a1e4c06c4214d3144e89132..8dbcb2b27eedb777a7ad020bbe4a52018b5ba19d 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -82,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
@@ -280,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##*/}"
 
@@ -295,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
 
@@ -307,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"