X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=tests%2Fsmoke-test;h=682d03b857da2192b21164fa20b3fae6400a0650;hp=f4717827aaedd500707516e9e2ddf389d7697d7f;hb=HEAD;hpb=71cb2d8940c874b4c8e8b4b876962fd380f223e1

diff --git a/tests/smoke-test b/tests/smoke-test
index f4717827a..682d03b85 100755
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -9,50 +9,13 @@ srcdir="$1"
 
 . "$srcdir"/tests/test-common.sh
 
-#
-# Currently expected to work only with thread package LWP, because:
-# 
-# - Thread scheduling is reliably deterministic only with LWP
-# - Shell builtin kill appears not to do the job in MinGW
-# - The Windows server tries to run as service when -d isn't
-#   specified
-#
-# TODO address these shortcomings.
-#
-if [ `sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile` != LWP ]
-then echo "Warning: smoke test not expected to work with this thread package!" >&2
-fi
-
 create_sandbox
 
 begin_test "$srcdir"/tests/smoke/fairland.xdump
 
-src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null
-
-t=
-for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`
-do
-    p="$t"
-    t="${i%/??}"
-    if [ "$p" != "$t" ] && [ "$p" ]
-    then
-	src/client/empire POGO peter <<EOF >/dev/null
-power new
-report *
-cen * ?own#0
-comm * ?own#0
-reso * ?own#0
-force
-EOF
-    fi
-    b="${i##*/}"
-    if [ $b -eq 0 ]
-    then c=POGO r=peter
-    else c="${b#0}"; r="$c"
-    fi
-    src/client/empire "$c" "$r" <"$i" >/dev/null
-done
+feed_input POGO peter "$srcdir"/tests/smoke/newcap_script
+feed_dir "$srcdir"/tests/smoke
 
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log smoke.xdump
+cmp_logs_xdump