alsa: Move trap to func_exit_handler

Squash before merging.

Instead of passing a script name,
the $SCRIPT_NAME variable is used.

restore_ trap removed and call
moved to the func_exit_handler

Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>

Author: LukaszMrugala

case-lib/hijack.sh

@@ -185,6 +185,11 @@ function func_exit_handler()
         fi
     }
 
+    # Restore ALSA settings after execution if state file exists
+    if [ -f /var/tmp/"${SCRIPT_NAME}".state ]; then
+        restore_alsa_state
+    fi
+
     print_test_result_exit $exit_status
 }
 

case-lib/lib.sh

@@ -1191,35 +1191,23 @@ perf_analyze()
 # Should be triggered at the end of
 # every test touching ALSA.
 # Couple with save_machine_state.
-# Passes through the status of the previous command
-# so as to not interefere with the func_exit_handler
-# param1: file name
 restore_alsa_state()
 {
-    status=$?
-    dlogi "restore_alsa_state called with ${1}"
-    if [ -f "$1" ]; then
-        dlogi "restore_alsa_state found relevant state file."
-        alsactl restore --file /var/tmp/"$1" --pedantic --no-ucm --no-init-fallback || dlogi "alsactl state restoration failed!"
-        rm /var/tmp/"$1" || dlogi "Old state file removal failed!"
+    dlogi "restore_alsa_state called in ${SCRIPT_NAME}"
+    if [ -f /var/tmp/"${SCRIPT_NAME}".state ]; then
+        dlogi "restore_alsa_state found a relevant state file."
+        alsactl restore --file /var/tmp/"${SCRIPT_NAME}".state --pedantic --no-ucm --no-init-fallback || dlogi "alsactl state restoration failed!"
+        rm /var/tmp/"${SCRIPT_NAME}".state || dlogi "Old state file removal failed!"
     fi
-    return "$status"
 }
 
 # Save the machine state to a file.
 # Should be used at the start of
 # every test touching ALSA.
-# Coupled with restore_machine_state on an exit signal.
-# param1: file name
+# Coupled with restore_machine_state
+# on an exit signal inside func_exit_handler.
 save_alsa_state()
 {
-    dlogi "save_alsa_state called with ${1}"
-    # Prepend the restore_alsa_state to the preexisting EXIT trap.
-    cur_exit_trap_code=$(trap -p EXIT | awk -F\' '{print $2}')
-    if [[ -z "${cur_exit_trap_code// }" ]]; then
-        trap "restore_alsa_state ${1}" EXIT
-    else
-        trap "restore_alsa_state ${1}; ${cur_exit_trap_code}" EXIT
-    fi
-    alsactl store --file /var/tmp/"$1" || dlogi "alsactl state storage failed!"
+    dlogi "save_alsa_state called in ${SCRIPT_NAME}"
+    alsactl store --file /var/tmp/"${SCRIPT_NAME}".state || dlogi "alsactl state storage failed!"
 }

test-case/check-alsabat.sh

@@ -74,7 +74,7 @@ sigmak=${OPT_VAL['k']}
 frames=${OPT_VAL['n']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 
 if [ "$pcm_p" = "" ]||[ "$pcm_c" = "" ];
 then

test-case/check-audio-equalizer.sh

@@ -43,7 +43,7 @@ func_pipeline_export "$tplg" "eq:any"
 sofcard=${SOFCARD:-0}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 setup_kernel_check_point
 
 # Test equalizer

test-case/check-capture.sh

@@ -58,7 +58,7 @@ out_dir=${OPT_VAL['o']}
 file_prefix=${OPT_VAL['f']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 logger_disabled || func_lib_start_log_collect
 
 setup_kernel_check_point

test-case/check-fw-echo-reference.sh

@@ -41,7 +41,7 @@ frames=${OPT_VAL['n']}
 frequency=${OPT_VAL['f']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 logger_disabled || func_lib_start_log_collect
 
 func_pipeline_export "$tplg" "echo:any"

test-case/check-keyword-detection.sh

@@ -54,7 +54,7 @@ preamble_time=${OPT_VAL['p']}
 duration=${OPT_VAL['d']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 logger_disabled || func_lib_start_log_collect
 
 func_pipeline_export "$tplg" "kpb:any"

test-case/check-kmod-load-unload-after-playback.sh

@@ -55,7 +55,7 @@ loop_cnt=${OPT_VAL['l']}
 pb_duration=${OPT_VAL['d']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 
 func_pipeline_export "$tplg" "type:playback"
 

test-case/check-kmod-load-unload.sh

@@ -39,7 +39,7 @@ func_opt_parse_option "$@"
 setup_kernel_check_point
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 
 loop_cnt=${OPT_VAL['l']}
 

test-case/check-pause-release-suspend-resume.sh

@@ -95,7 +95,7 @@ test_mode=${OPT_VAL['m']}
 file_name=${OPT_VAL['F']}
 
 start_test
-save_alsa_state "${0##*/}".state
+save_alsa_state
 
 case $test_mode in
     "playback")