aboutsummaryrefslogtreecommitdiff
path: root/tests/testsuite.at
diff options
context:
space:
mode:
Diffstat (limited to 'tests/testsuite.at')
-rw-r--r--tests/testsuite.at16
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
28m4_define([PIES_XFAIL_CHECK],[AT_XFAIL_IF([test -f $[]XFAILFILE])]) 28m4_define([PIES_XFAIL_CHECK],[AT_XFAIL_IF([test -f $[]XFAILFILE])])
29 29
30m4_define([PIES_CONTROL_INIT],[ 30m4_define([PIES_CONTROL_INIT],[
31pidfile="$PWD/pies.pid" 31PIES_PIDFILE="$PWD/pies.pid"
32ctlsock="unix://$PWD/pies.ctl"; 32PIES_CTLSOCK="unix://$PWD/pies.ctl";
33export PIES_PIDFILE PIES_CTLSOCK
33cat > control.conf <<_EOT 34cat > control.conf <<_EOT
34pidfile "$pidfile"; 35pidfile "$PIES_PIDFILE";
35control { 36control {
36 socket "$ctlsock"; 37 socket "$PIES_CTLSOCK";
37} 38}
38_EOT 39_EOT
39]) 40])
40 41
41m4_define([PIES_STOP],[ 42m4_define([PIES_STOP],[
42piesctl --url "$ctlsock" shutdown 43piesctl --url "$PIES_CTLSOCK" shutdown
43pies_stop_spinner=0 44pies_stop_spinner=0
44while test -f $pidfile 45while test -f $PIES_PIDFILE
45do 46do
46 sleep 1 47 sleep 1
47 pies_stop_spinner=$(($pies_stop_spinner + 1)) 48 pies_stop_spinner=$(($pies_stop_spinner + 1))
48 if test $pies_stop_spinner -gt 3; then 49 if test $pies_stop_spinner -gt 3; then
49 kill `cat $pidfile` 50 kill `cat $PIES_PIDFILE`
50 echo >&2 "timed out waiting for shutdown" 51 echo >&2 "timed out waiting for shutdown"
51 fi 52 fi
52done]) 53done])
@@ -69,6 +70,7 @@ m4_include([startup.at])
69m4_include([shutdown.at]) 70m4_include([shutdown.at])
70m4_include([shell.at]) 71m4_include([shell.at])
71m4_include([inet.at]) 72m4_include([inet.at])
73m4_include([maxinst.at])
72 74
73m4_include([envop.at]) 75m4_include([envop.at])
74m4_include([env.at]) \ No newline at end of file 76m4_include([env.at]) \ No newline at end of file

Return to:

Send suggestions and report system problems to the System administrator.