tests/run: handle 'expr 1 - 1' (exitcode 1); check for running awesome

2015-08-05 19:58:00 +02:00 · 2015-08-05 19:58:00 +02:00 · 85facc0391
parent 71f549ee79
commit 85facc0391
1 changed files with 2 additions and 2 deletions
--- a/tests/run.sh
+++ b/tests/run.sh
@ -123,8 +123,8 @@ start_awesome() {
        if [ $ret = 0 ]; then
            break
        fi
-        max_wait=$(expr $max_wait - 1)
-        if [ "$max_wait" -lt 0 ]; then
+        max_wait=$(expr $max_wait - 1 || true)
+        if [ "$max_wait" -lt 0 ] || ! kill -0 $awesome_pid ; then
            echo "Error: did not receive a successful reply via awesome-client!"
            echo "Last reply: $client_reply."
            echo "Log:"