From 6193107fd5b7af2e03b21debad9cf081ac7ed798 Mon Sep 17 00:00:00 2001 From: Amery Song Date: Mon, 6 Jul 2020 17:18:35 +0800 Subject: [PATCH 1/3] case-lib: don't ignore DMIC16k pipeline DMIC16k pipeline mostly acts as KWD pipeline, and it cannot be seperated from other normal capture pipelines, so DMIC16k pipeline is not tested, even it doens't act as KWD pipeline on some platforms. After a enhancement in sof-tplgreader.py, we can easily seperate KWD pipeline from ohter pipelines. So don't need to ignore DMIC16k test any more. DMIC16k blocked by: #74 Pipeline filter enhanced by: #269 Signed-off-by: Amery Song --- case-lib/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case-lib/config.sh b/case-lib/config.sh index 96b6c9d4..71f3e86b 100644 --- a/case-lib/config.sh +++ b/case-lib/config.sh @@ -15,7 +15,7 @@ TPLG_ROOT=${TPLG_ROOT:-/lib/firmware/intel/sof-tplg} # example: ignore 'pcms that are HDA Digital & HDA Analog' # TPLG_IGNORE_LST['pcm']='HDA Digital,HDA Analog' declare -A TPLG_IGNORE_LST -TPLG_IGNORE_LST['pcm']='HDA Digital,Media Playback,DMIC16k' +TPLG_IGNORE_LST['pcm']='HDA Digital,Media Playback' # Will be set by the lib function, don't need to set # Catches the last line of /var/log/kern.log, which will be used by From b561eb1bfcefa6bf0caad77de59af8b393755bc6 Mon Sep 17 00:00:00 2001 From: Amery Song Date: Mon, 6 Jul 2020 17:32:18 +0800 Subject: [PATCH 2/3] test-case: case fix after adding DMIC16k back The default behavior of sof-tplgreader.py will print information of all pipelines, include KWD. Need to add filter option to exclude KWD pipeline in none KWD test case after DMIC16k pipeline added back. Signed-off-by: Amery Song --- test-case/check-runtime-pm-double-active.sh | 2 +- test-case/check-runtime-pm-status.sh | 2 +- test-case/multiple-pause-resume.sh | 2 +- test-case/multiple-pipeline-capture.sh | 2 +- test-case/multiple-pipeline-playback.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test-case/check-runtime-pm-double-active.sh b/test-case/check-runtime-pm-double-active.sh index fa2ab9d9..7d0f5453 100755 --- a/test-case/check-runtime-pm-double-active.sh +++ b/test-case/check-runtime-pm-double-active.sh @@ -70,7 +70,7 @@ APP_LST['capture']='arecord' DEV_LST['capture']='/dev/null' [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect -func_pipeline_export $tplg +func_pipeline_export $tplg "type:any" func_lib_setup_kernel_last_line for idx in $(seq 0 $(expr $PIPELINE_COUNT - 1)) diff --git a/test-case/check-runtime-pm-status.sh b/test-case/check-runtime-pm-status.sh index 322847ea..d959574f 100755 --- a/test-case/check-runtime-pm-status.sh +++ b/test-case/check-runtime-pm-status.sh @@ -64,7 +64,7 @@ APP_LST['capture']='arecord' DEV_LST['capture']='/dev/null' [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect -func_pipeline_export $tplg +func_pipeline_export $tplg "type:any" func_lib_setup_kernel_last_line for idx in $(seq 0 $(expr $PIPELINE_COUNT - 1)) diff --git a/test-case/multiple-pause-resume.sh b/test-case/multiple-pause-resume.sh index 4d0cc443..dfec3348 100755 --- a/test-case/multiple-pause-resume.sh +++ b/test-case/multiple-pause-resume.sh @@ -52,7 +52,7 @@ rnd_range=$[ $rnd_max - $rnd_min ] [[ $rnd_range -le 0 ]] && dlogw "Error random range scope [ min:$rnd_min - max:$rnd_max ]" && exit 2 tplg=${OPT_VALUE_lst['t']} -func_pipeline_export $tplg +func_pipeline_export $tplg "type:any" [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect diff --git a/test-case/multiple-pipeline-capture.sh b/test-case/multiple-pipeline-capture.sh index 5eaa3d08..d9aef687 100755 --- a/test-case/multiple-pipeline-capture.sh +++ b/test-case/multiple-pipeline-capture.sh @@ -45,7 +45,7 @@ OPT_PARM_lst['l']=1 OPT_VALUE_lst['l']=1 func_opt_parse_option "$@" loop_cnt=${OPT_VALUE_lst['l']} tplg=${OPT_VALUE_lst['t']} -func_pipeline_export $tplg +func_pipeline_export $tplg "type:any" [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect max_count=0 diff --git a/test-case/multiple-pipeline-playback.sh b/test-case/multiple-pipeline-playback.sh index af88d9e4..b4b7a029 100755 --- a/test-case/multiple-pipeline-playback.sh +++ b/test-case/multiple-pipeline-playback.sh @@ -45,7 +45,7 @@ OPT_PARM_lst['l']=1 OPT_VALUE_lst['l']=1 func_opt_parse_option "$@" loop_cnt=${OPT_VALUE_lst['l']} tplg=${OPT_VALUE_lst['t']} -func_pipeline_export $tplg +func_pipeline_export $tplg "type:any" [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect max_count=0 From b79cb12184a9e16aa9359508a8bed7755749adf2 Mon Sep 17 00:00:00 2001 From: Amery Song Date: Mon, 6 Jul 2020 17:51:47 +0800 Subject: [PATCH 3/3] test-case: remove redundant pipeline exporting code Pipeline is exported in test procedures with more specific filter option, remove this redundant 'all' pipeline exporting code. Signed-off-by: Amery Song --- test-case/check-xrun-injection.sh | 1 - test-case/multiple-pipeline-capture.sh | 1 - test-case/multiple-pipeline-playback.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/test-case/check-xrun-injection.sh b/test-case/check-xrun-injection.sh index 6b656ec1..803c5670 100755 --- a/test-case/check-xrun-injection.sh +++ b/test-case/check-xrun-injection.sh @@ -45,7 +45,6 @@ interval=${OPT_VALUE_lst['i']} func_lib_setup_kernel_last_line func_lib_check_sudo -func_pipeline_export $tplg "type:playback,capture" case $test_mode in "playback") diff --git a/test-case/multiple-pipeline-capture.sh b/test-case/multiple-pipeline-capture.sh index d9aef687..916dc712 100755 --- a/test-case/multiple-pipeline-capture.sh +++ b/test-case/multiple-pipeline-capture.sh @@ -45,7 +45,6 @@ OPT_PARM_lst['l']=1 OPT_VALUE_lst['l']=1 func_opt_parse_option "$@" loop_cnt=${OPT_VALUE_lst['l']} tplg=${OPT_VALUE_lst['t']} -func_pipeline_export $tplg "type:any" [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect max_count=0 diff --git a/test-case/multiple-pipeline-playback.sh b/test-case/multiple-pipeline-playback.sh index b4b7a029..2d84dc0a 100755 --- a/test-case/multiple-pipeline-playback.sh +++ b/test-case/multiple-pipeline-playback.sh @@ -45,7 +45,6 @@ OPT_PARM_lst['l']=1 OPT_VALUE_lst['l']=1 func_opt_parse_option "$@" loop_cnt=${OPT_VALUE_lst['l']} tplg=${OPT_VALUE_lst['t']} -func_pipeline_export $tplg "type:any" [[ ${OPT_VALUE_lst['s']} -eq 1 ]] && func_lib_start_log_collect max_count=0