test-case: verify-tplg-binary/pcm-list: Support multiple topology files

Both tests now accept colon or comma-separated list of topology
paths by -t / TPLG, consistent with new func_tplg_parse_and_validate()
convention introduced in case-lib/pipeline.sh.

verify-tplg-binary.sh:
- Normalise separator to colon, split into array, iterate per file
- Call func_lib_get_tplg_path() per entry; dlogw + skip on missing
  file instead of die() (optional topologies on headless systems)
- Print md5sum and sof-tplgreader.py output per topology
- Run tplgtool2.py per file; include filename in die() message
- Remove now-redundant main() wrapper
- Print a summary line after all files pass

verify-pcm-list.sh:
- Use func_tplg_parse_and_validate() to resolve all topologies;
  carry NO_HDMI_MODE / NO_BT_MODE / NO_DMIC_MODE automatically
- Build sof-tplgreader.py -f filter string from active NO_*
  variables, mirroring func_pipeline_export() filter logic, so
  pipeline list compared against /proc/asound/pcm is consistent
- Pass comma joined TPLG_FILES to sof-tplgreader.py
- Deduplication: with TPLG_COUNT > 1 use awk 'NF && !seen[$0]++'
  remove exact duplicate lines while preserving original order;
  dont deduplicate by id alone PCM legitimately has both
  playback and capture entry sharing same id

Signed-off-by: Mateusz Junkier <mateusz.junkier@intel.com>

Author: majunkier

test-case/verify-pcm-list.sh

@@ -6,8 +6,9 @@
 ##    driver already inserted with modprobe
 ## Description:
 ##    using /proc/asound/pcm to compare with tplg content
+##    Supports multiple topology files separated by colon (:) or comma (,)
 ## Case step:
-##    1. load tplg file to get pipeline list string
+##    1. load tplg file(s) to get pipeline list string
 ##    2. load /proc/asound/pcm to get pcm list string
 ##    3. compare string list
 ## Expect result:
@@ -20,22 +21,66 @@ set -e
 # shellcheck source=case-lib/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/../case-lib/lib.sh"
 
-OPT_NAME['t']='tplg'     OPT_DESC['t']='tplg file, default value is env TPLG: $''TPLG'
+# Normalize pipeline list formatting and ordering so comparison is order-insensitive
+# but still count-sensitive (no deduplication).
+normalize_pipeline_list() {
+    awk 'NF { print }' | sort -V
+}
+
+OPT_NAME['t']='tplg'     OPT_DESC['t']='tplg file(s), separated by : or , default value is env TPLG: $''TPLG'
 OPT_HAS_ARG['t']=1         OPT_VAL['t']="${TPLG:-}"
 
 func_opt_parse_option "$@"
 tplg=${OPT_VAL['t']}
 
 start_test
 
-tplg_path=$(func_lib_get_tplg_path "$tplg") ||
-       	die "No available topology for this test case"
+# Support multiple topologies separated by colon (:) or comma (,)
+# sof-tplgreader.py natively supports multiple files with comma separator
+tplg="${tplg//,/:}"  # Normalize to colon first
+# Parse and validate topology files
+func_tplg_parse_and_validate "$tplg"
+tplg_files="$TPLG_FILES"
+
+dlogi "Processing $TPLG_COUNT topology file(s)"
+
+setup_kernel_check_point
+
+# Build filter options (same as pipeline.sh func_pipeline_export)
+opt=""
+# In no HDMI mode, exclude HDMI pipelines
+[ -z "$NO_HDMI_MODE" ] || opt="$opt & ~pcm:HDMI"
+# In no Bluetooth mode, exclude BT pipelines
+[ -z "$NO_BT_MODE" ] || opt="$opt & ~pcm:Bluetooth"
+# In no DMIC mode, exclude DMIC pipelines
+[ -z "$NO_DMIC_MODE" ] || opt="$opt & ~pcm:DMIC"
+
+# Remove leading " & " if present
+opt="${opt# & }"
+
+# Build sof-tplgreader.py command with filter
+if [ -n "$opt" ]; then
+    dlogi "Applying pipeline filter: $opt"
+    tplg_str=$(sof-tplgreader.py "$tplg_files" -f "$opt" -d id pcm type -o)
+else
+    tplg_str=$(sof-tplgreader.py "$tplg_files" -d id pcm type -o)
+fi
+
+# Deduplicate exact duplicate lines only, preserve original order.
+# Do NOT deduplicate by id because one PCM can have both playback and capture
+# entries with the same id.
+if [ "$TPLG_COUNT" -gt 1 ]; then
+    tplg_str=$(echo "$tplg_str" | awk 'NF && !seen[$0]++')
+    dlogi "Deduplicated identical pipelines from $TPLG_COUNT topology files"
+fi
+
+# Normalize topology output ordering before comparison
+tplg_str=$(echo "$tplg_str" | normalize_pipeline_list)
 
-tplg_str=$(sof-tplgreader.py "$tplg_path" -d id pcm type -o)
-pcm_str=$(sof-dump-status.py -i "${SOFCARD:-0}")
+pcm_str=$(sof-dump-status.py -i "${SOFCARD:-0}" | normalize_pipeline_list)
 
-dlogc "sof-tplgreader.py $tplg_path -d id pcm type -o"
-dlogi "Pipeline(s) from topology file:"
+dlogc "Processed $TPLG_COUNT topology file(s)"
+dlogi "Pipeline(s) from topology file(s):"
 echo "$tplg_str"
 dlogc "sof-dump-status.py -i ${SOFCARD:-0}"
 dlogi "Pipeline(s) from system:"

test-case/verify-tplg-binary.sh

@@ -6,6 +6,7 @@
 ##    SOF topology files install at "/lib/firmware/intel/sof-tplg"
 ## Description:
 ##    check target topology files md5sum
+##    Supports multiple topology files separated by colon (:) or comma (,)
 ## Case step:
 ##    1. check if topology files exist
 ##    2. dump tplg files md5sum
@@ -19,37 +20,51 @@ set -e
 # shellcheck source=case-lib/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
 
-OPT_NAME['t']='tplg'     OPT_DESC['t']="tplg file, default value is env TPLG: $TPLG"
+OPT_NAME['t']='tplg'     OPT_DESC['t']="tplg file(s), separated by : or , default value is env TPLG: $TPLG"
 OPT_HAS_ARG['t']=1         OPT_VAL['t']="$TPLG"
 
 func_opt_parse_option "$@"
 tplg=${OPT_VAL['t']}
 
 start_test
 
-tplg_path=$(func_lib_get_tplg_path "$tplg") ||
-    die "No available topology ($tplg) for this test case"
+# Support multiple topologies separated by colon (:) or comma (,)
+# Convert comma separators to colons for uniform handling
+tplg="${tplg//,/:}"
+IFS=':' read -ra tplg_array <<< "$tplg"
 
-dlogi "Checking topology file: $tplg_path with sof-tplgreader.py"
-dlogi "Found file: $(md5sum "$tplg_path" | awk '{print $2, $1;}')"
-tplgData=$(sof-tplgreader.py "$tplg_path") ||
-    die "No valid pipeline(s) found in $tplg_path"
-
-dlogi "Valid pipeline(s) in this topology:"
-echo "===========================>>"
-echo "$tplgData"
-echo "<<==========================="
-
-main()
-{
+# Process each topology
+for single_tplg in "${tplg_array[@]}"; do
+    single_tplg="${single_tplg## }"; single_tplg="${single_tplg%% }"  # Trim whitespace
+    [[ -z "$single_tplg" ]] && continue
+    
+    tplg_path=$(func_lib_get_tplg_path "$single_tplg") || {
+        dlogw "Topology not found: $single_tplg (skipping)"
+        continue
+    }
+    
+    dlogi "========================================"
+    dlogi "Checking topology file: $tplg_path with sof-tplgreader.py"
+    dlogi "Found file: $(md5sum "$tplg_path" | awk '{print $2, $1;}')"
+    tplgData=$(sof-tplgreader.py "$tplg_path") || {
+        dloge "No valid pipeline(s) found in $tplg_path"
+        continue
+    }
+    
+    dlogi "Valid pipeline(s) in this topology:"
+    echo "============================>>"
+    echo "$tplgData"
+    echo "<<============================="
+    
     # This one can find more problems, see sof-test#1054
     dlogi "Checking topology file with tplgtool2.py: $tplg_path"
     ( set -x
       tplgtool2.py -D "${LOG_ROOT}" "$tplg_path" ) || {
         ret=$?
-        die "tplgtool2.py returned $ret"
+        die "tplgtool2.py returned $ret for $tplg_path"
     }
-}
+done
 
-main
+dlogi "========================================"
+dlogi "All topology files verified successfully"