tests: Factor out begin_tests(), end_tests()

[empserver] / tests / smoke-test

diff --git a/tests/smoke-test b/tests/smoke-test
index c5b0d3768b0bc5c545463874a3b657502e232360..f79a3b3d7e9d32b196ff295fda36b930b1d7f71a 100755 (executable)
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -25,13 +25,10 @@ fi
 
 create_sandbox
 
-# Create world and start server
-src/util/files -e sandbox/etc/empire/econfig -f >/dev/null
-src/util/empdump -e sandbox/etc/empire/econfig -i "$srcdir"/tests/smoke/fairland.xdump
-start_server
+begin_test "$srcdir"/tests/smoke/fairland.xdump
+
 src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null
 
-# Feed player input
 need_update=
 for i in "$srcdir"/tests/smoke/[0-9]*
 do
@@ -59,10 +56,6 @@ EOF
     need_update=y
 done
 
-# Stop server
-stop_server
-
-src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/smoke.xdump
+end_test
 
-# Smoke test completed; compare results
 cmp_out var/empire/server.log var/empire/journal.log smoke.xdump