fairland: Fail when island can't be placed, for fairness

[empserver] / tests / fairland-test

diff --git a/tests/fairland-test b/tests/fairland-test
index 9a7cfbc50715bc594d65d9a4f5a958d3f5931dd9..717f5a01851f97a0e01272f78e20e97fa0dd6481 100755 (executable)
--- a/tests/fairland-test
+++ b/tests/fairland-test
@@ -11,13 +11,22 @@ srcdir="$1"
 
 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
-
-exec 3>&-
-
-src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump
-
-cmp_out fairland.out final.xdump newcap_script
+$files -f >/dev/null
+run_and_cmp plain $fairland -s sandbox/plain-newcap_script -R 1 5 30
+$empdump -x >sandbox/plain.xdump
+cmp_out plain.xdump plain-newcap_script
+
+$files -f >/dev/null
+run_and_cmp stunted $fairland -s sandbox/stunted-newcap_script -R 1 8 35 16 15 0 0 5 2
+$empdump -x >sandbox/stunted.xdump
+cmp_out stunted.xdump stunted-newcap_script
+
+$files -f >/dev/null
+run_and_cmp no-spike $fairland -s sandbox/no-spike-newcap_script -R 1 3 30 15 10 0
+$empdump -x >sandbox/no-spike.xdump
+cmp_out no-spike.xdump no-spike-newcap_script
+
+$files -f >/dev/null
+run_and_cmp spike $fairland -s sandbox/spike-newcap_script -R 1 -i 8 30 8 20 50 10
+$empdump -x >sandbox/spike.xdump
+cmp_out spike.xdump spike-newcap_script