client: Unbreak standalone build

[empserver] / tests / smoke-test

diff --git a/tests/smoke-test b/tests/smoke-test
index e75fb3907997c8c4de127f142e23cc8406697deb..682d03b857da2192b21164fa20b3fae6400a0650 100755 (executable)
--- 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
 
 feed_input POGO peter "$srcdir"/tests/smoke/newcap_script
-
-t=
-for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`
-do
-    p="$t"
-    t="${i%/??}"
-    if [ "$p" != "$t" ] && [ "$p" ]
-    then
-       feed_input POGO peter <<EOF
-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
-    feed_input "$c" "$r" "$i"
-done
+feed_dir "$srcdir"/tests/smoke
 
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log smoke.xdump
+cmp_logs_xdump