test: fix skipping: test jack detection

Fix skip if no module named: usbrelay.
Add skip if no relays hardware are detected.

Signed-off-by: Artur Wilczak <arturx.wilczak@intel.com>

Author: arikgreen

case-lib/relay.sh

@@ -10,11 +10,12 @@ usbrelay_switch()
 {
     if [[ "$1" == "--debug" ]]; then
         dlogi "Debug mode: Current status of all relays:"
-        usbrelay || {
-            die "Failed to get usbrelay status.
-            The usbrelay hw module is not responding or no relays detected.
-            Check hardware connection."
-        }
+        if usbrelay --debug 2>&1 | grep -q "Found 0 devices"; then
+            dloge "No relays detected. Found 0 devices. Check hardware connection."
+            dloge "The usbrelay hw module is not responding or no relays detected. Check hardware connection."
+            # Skip the test if no relays are detected
+            exit 2
+        fi
     fi
 
     # Declare a constant for the relay settle time

test-case/test-jack-detection-playback-capture.sh

@@ -62,20 +62,20 @@ OPT_HAS_ARG['d']=1                  OPT_VAL['d']=3
 OPT_NAME['u']='relay'               OPT_DESC['u']='name of usbrelay switch, default value is HURTM_2'
 OPT_HAS_ARG['u']=1                  OPT_VAL['u']="HURTM_2"
 
-OPT_NAME['h']='headphone'           OPT_DESC['h']='name of pcm control for headphone jack'
-OPT_HAS_ARG['h']=1                  OPT_VAL['h']="headphone jack"
+OPT_NAME['H']='headphone'           OPT_DESC['H']='name of pcm control for headphone jack'
+OPT_HAS_ARG['H']=1                  OPT_VAL['H']="headphone jack"
 
-OPT_NAME['m']='headset'             OPT_DESC['m']='name of pcm control for headset mic jack'
-OPT_HAS_ARG['m']=1                  OPT_VAL['m']="headset [a-z ]*jack"
+OPT_NAME['M']='headset'             OPT_DESC['M']='name of pcm control for headset mic jack'
+OPT_HAS_ARG['M']=1                  OPT_VAL['M']="headset [a-z ]*jack"
 
 func_opt_parse_option "$@"
 
 tplg=${OPT_VAL['t']}
 relay=${OPT_VAL['u']}
 loop_cnt=${OPT_VAL['l']}
 dsp_settle_time=${OPT_VAL['d']}
-headphone_jack_name=${OPT_VAL['h']}
-headset_mic_jack_name=${OPT_VAL['m']}
+headphone_jack_name=${OPT_VAL['H']}
+headset_mic_jack_name=${OPT_VAL['M']}
 
 check_control_switch_state()
 {
@@ -87,6 +87,8 @@ check_control_switch_state()
     local expected_control_state="$2"
     local control_state
 
+    dlogi "Check if the state of control: $control_name is correct."
+
     control_state=$(amixer -c "$SOFCARD" contents | awk -v name="$control_name" '
         BEGIN { IGNORECASE=1; found=0 }
         /name='\''/ {
@@ -103,6 +105,7 @@ check_control_switch_state()
     if [[ "$expected_control_state" == "$control_state" ]]; then
         return 0
     else
+        dloge "Expected control state ($expected_control_state) but got ($control_state)."
         return 1
     fi
 }
@@ -185,17 +188,22 @@ main()
     # Check if usbrelay tool is installed
     command -v usbrelay || {
         # If usbrelay package is not installed
-        skip_test "usbrelay command not found. Please install usbrelay package."
+        skip_test "usbrelay command not found."
     }
 
-    logger_disabled || func_lib_start_log_collect
-
     # display current status of relays
-    usbrelay --debug
+    usbrelay_switch --debug || {
+        skip_test "Failed to get usbrelay status."
+    }
+
+    logger_disabled || func_lib_start_log_collect
 
     dlogi "Reset - plug jack audio"
     usbrelay_switch "$relay" 0
 
+    dlogi "Headphone patten: $headphone_jack_name"
+    dlogi "Headset mic pattern: $headset_mic_jack_name"
+
     for idx in $(seq 0 $((PIPELINE_COUNT - 1)))
     do
         initialize_audio_params "$idx"