From 9c489fda2ebd1d087fb8aa3af7206aa73c2c2273 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Thu, 5 Nov 2020 17:48:53 -0800
Subject: [PATCH] multiple-pipeline: fix set -e compatibility and add it

Notably remove top-level "expr" because "expr 0" is surprisingly a
failure and expr is antiquited anyway (SC2003)

Progress towards #312.

Also add a dlogc() before killing so no one mistakes the deaths of aplay
and arecord for failures.

Add shellcheck source=case-lib/lib.sh, removes 5 warnings.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 test-case/multiple-pipeline-capture.sh | 33 ++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/test-case/multiple-pipeline-capture.sh b/test-case/multiple-pipeline-capture.sh
index 084760ae..98e617f1 100755
--- a/test-case/multiple-pipeline-capture.sh
+++ b/test-case/multiple-pipeline-capture.sh
@@ -22,6 +22,9 @@
 ##    all pipelines are alive and without kernel error
 ##
 
+set -e
+
+# shellcheck source=case-lib/lib.sh
 source $(dirname ${BASH_SOURCE[0]})/../case-lib/lib.sh
 
 OPT_OPT_lst['t']='tplg'     OPT_DESC_lst['t']='tplg file, default value is env TPLG: $TPLG'
@@ -87,8 +90,8 @@ func_run_pipeline_with_type()
         dlogc "${APP_LST[$1]} -D $dev -c $channel -r $rate -f $fmt ${DEV_LST[$1]} -q"
         "${APP_LST[$1]}" -D $dev -c $channel -r $rate -f $fmt "${DEV_LST[$1]}" -q &
 
-        tmp_count=$(expr $tmp_count - 1 )
-        [[ $tmp_count -le 0 ]] && return
+        : $((tmp_count--))
+        if [ "$tmp_count" -le 0 ]; then return 0; fi
     done
 }
 
@@ -116,17 +119,17 @@ do
     # check all refer capture pipeline status
     # 1. check process count:
     pcount=$(pidof arecord|wc -w)
-    tmp_count=$(expr $tmp_count + $pcount)
+    tmp_count=$((tmp_count + pcount))
     pcount=$(pidof aplay|wc -w)
-    tmp_count=$(expr $tmp_count + $pcount)
+    tmp_count=$((tmp_count + pcount))
     [[ $tmp_count -ne $max_count ]] && func_error_exit "Target pipeline count: $max_count, current process count: $tmp_count"
 
     # 2. check arecord process status
     dlogi "checking pipeline status"
-    sof-process-state.sh arecord >/dev/null
-    [[ $? -eq 1 ]] && func_error_exit "Catch the abnormal process status of arecord"
-    sof-process-state.sh aplay >/dev/null
-    [[ $? -eq 1 ]] && func_error_exit "Catch the abnormal process status of aplay"
+    sof-process-state.sh arecord >/dev/null ||
+        func_error_exit "Catch the abnormal process status of arecord"
+    sof-process-state.sh aplay >/dev/null ||
+        func_error_exit "Catch the abnormal process status of aplay"
 
     dlogi "preparing sleep ${OPT_VALUE_lst['w']}"
     sleep ${OPT_VALUE_lst['w']}
@@ -134,20 +137,20 @@ do
     # 3. check process count again:
     tmp_count=0
     pcount=$(pidof arecord|wc -w)
-    tmp_count=$(expr $tmp_count + $pcount)
+    tmp_count=$((tmp_count + pcount))
     pcount=$(pidof aplay|wc -w)
-    tmp_count=$(expr $tmp_count + $pcount)
+    tmp_count=$((tmp_count + pcount))
     [[ $tmp_count -ne $max_count ]] && func_error_exit "Target pipeline count: $max_count, current process count: $tmp_count"
 
     # 4. check arecord process status
     dlogi "checking pipeline status again"
-    sof-process-state.sh arecord >/dev/null
-    [[ $? -eq 1 ]] && func_error_exit "Catch the abnormal process status of arecord"
-    sof-process-state.sh aplay >/dev/null
-    [[ $? -eq 1 ]] && func_error_exit "Catch the abnormal process status of aplay"
+    sof-process-state.sh arecord >/dev/null ||
+        func_error_exit "Catch the abnormal process status of arecord"
+    sof-process-state.sh aplay >/dev/null ||
+        func_error_exit "Catch the abnormal process status of aplay"
 
 
-    # kill all arecord
+    dlogc 'pkill -9 aplay arecord'
     pkill -9 arecord
     pkill -9 aplay