-tcn="$1"
-test -d ../testcases || cd testcases
-
-exec <$tcn.log
-read initfile
-read queryargs
-initstring="`cat $initfile.init`"
-../hplayback "/$initstring" $queryargs
+mrc=1
+trap 'exit $mrc' 0
+
+casename="$1"
+case="case-$casename"
+ocase="output-$casename"
+
+exec 4<"$case.sys"
+read <&4 program initfile initflags
+read <&4 queryargs
+
+initstring="`cat init-$initfile.text`"
+xinitflagsf=$program-xinitflags.text
+if test -f $xinitflagsf
+then
+ initflags="$initflags `cat $xinitflagsf`";
+else
+ initflags="$initflags /"
+fi
+
+rm -f $ocase.*
+
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
+if test -f "$case.in"
+then
+ exec <"$case.in"
+else
+ exec </dev/null
+fi
+
+playback=./${program}_playback
+if test ! -f $playback
+then
+ printf "SKIPPED-$casename "
+ mrc=5
+ exit
+fi
+
+set +e
+ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+ 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
+ $playback $initflags"$initstring" $queryargs
+rc=$?
+set -e
+
+if [ "$rc" = 5 ]
+then
+ printf "SKIPPED-$casename "
+ mrc=5
+ exit
+fi
+
+echo "rc=$rc" >>$ocase.out
+
+failed=false
+for part in err out
+do
+ if diff -u -- "$case.$part" "$ocase.$part"
+ then
+ :
+ else
+ failwhy="$failwhy WRONG OUTPUT"
+ fi
+done
+
+cat <&4 >"$ocase.leftover"
+if egrep . /dev/null "$ocase.leftover"
+then
+ failwhy="$failwhy EXITED EARLY"
+fi
+
+if [ "x$failwhy" != x ]
+then
+ scremain="`wc -l <\"$ocase.leftover\"`"
+ echo >&2 "FAILED $case -$failwhy - lines of syscall remaining $scremain"
+ mrc=2
+ exit
+fi
+
+printf "$casename "
+mrc=0