diff options
Diffstat (limited to 'tests/testsuite.at')
| -rw-r--r-- | tests/testsuite.at | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index 822ac7b..0682b51 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -28,25 +28,26 @@ _EOT m4_define([PIES_XFAIL_CHECK],[AT_XFAIL_IF([test -f $[]XFAILFILE])]) m4_define([PIES_CONTROL_INIT],[ -pidfile="$PWD/pies.pid" -ctlsock="unix://$PWD/pies.ctl"; +PIES_PIDFILE="$PWD/pies.pid" +PIES_CTLSOCK="unix://$PWD/pies.ctl"; +export PIES_PIDFILE PIES_CTLSOCK cat > control.conf <<_EOT -pidfile "$pidfile"; +pidfile "$PIES_PIDFILE"; control { - socket "$ctlsock"; + socket "$PIES_CTLSOCK"; } _EOT ]) m4_define([PIES_STOP],[ -piesctl --url "$ctlsock" shutdown +piesctl --url "$PIES_CTLSOCK" shutdown pies_stop_spinner=0 -while test -f $pidfile +while test -f $PIES_PIDFILE do sleep 1 pies_stop_spinner=$(($pies_stop_spinner + 1)) if test $pies_stop_spinner -gt 3; then - kill `cat $pidfile` + kill `cat $PIES_PIDFILE` echo >&2 "timed out waiting for shutdown" fi done]) @@ -69,6 +70,7 @@ m4_include([startup.at]) m4_include([shutdown.at]) m4_include([shell.at]) m4_include([inet.at]) +m4_include([maxinst.at]) m4_include([envop.at]) m4_include([env.at])
\ No newline at end of file |