From 3097725e8d7823fc05e32678c3478f15b4865957 Mon Sep 17 00:00:00 2001 From: Yong-an Lu Date: Wed, 9 Mar 2022 11:07:00 +0800 Subject: [PATCH] multiple-pipeline: skip Echo Reference pipeline when getting count Previously, the Echo Reference pipeline has been skipped when running the parallel pipeline test, but it wasn't skipped when calculating PIPELINE_COUNT. Therefore, on all pipelines mode, the expected process count is inconsistent with the actual running process. To solve this issue, skip the same pipeline when acquiring the pipeline count for consistency. Signed-off-by: Yongan Lu --- test-case/multiple-pipeline.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test-case/multiple-pipeline.sh b/test-case/multiple-pipeline.sh index 214facf5..9fb84af3 100755 --- a/test-case/multiple-pipeline.sh +++ b/test-case/multiple-pipeline.sh @@ -67,9 +67,11 @@ tplg=${OPT_VAL['t']} f_arg=${OPT_VAL['f']} logger_disabled || func_lib_start_log_collect +# skip the Echo Reference pipeline +MULTI_PIPELINE_FILTER='~pcm:Amplifier Reference' max_count=0 # this line will help to get $PIPELINE_COUNT -func_pipeline_export "$tplg" "type:any" +func_pipeline_export "$tplg" "type:any & ${MULTI_PIPELINE_FILTER}" # acquire pipeline count that will run in parallel, if the number of pipeline # in topology is less than the required pipeline count, all pipeline will be started. [[ $PIPELINE_COUNT -gt ${OPT_VAL['c']} ]] && max_count=${OPT_VAL['c']} || max_count=$PIPELINE_COUNT @@ -170,11 +172,11 @@ do 'p' | 'a') tmp_count=$max_count func_run_pipeline_with_type "playback" - func_run_pipeline_with_type "capture" "~pcm:Amplifier Reference" + func_run_pipeline_with_type "capture" "${MULTI_PIPELINE_FILTER}" ;; 'c') tmp_count=$max_count - func_run_pipeline_with_type "capture" "~pcm:Amplifier Reference" + func_run_pipeline_with_type "capture" "${MULTI_PIPELINE_FILTER}" func_run_pipeline_with_type "playback" ;; *)