Commit 3768bfe
committed
test-case: simultaneous-p-c/volume/multiple-pipeline: Support multiple topologies
Three execution-class test cases updated to handle multi-topology
TPLG input and avoid testing same physical PCM device more than once.
simultaneous-playback-capture.sh:
- Accepts colon/comma-separated TPLG by func_tplg_parse_and_validate()
- Rewrite 'both' pipeline detection:
* Parse sof-tplgreader.py output for 'id=X;...type=(playback|capture)'
* Track seen 'id:type' pairs to skip exact duplicates from multiple
topology files (same id+type in two files)
* Accumulate id_has_playback[] and id_has_capture[] separately
* Collect only IDs present in both maps. true 'both' pipelines,
even when playback and capture come from different topology files
- Updated description and OPT_DESC to document multi-file usage
volume-basic-test.sh:
- Call func_tplg_parse_and_validate(); iterate TPLG_FILES split on ','
- Append topo_vol_kcontrols.py output per topology to temp array
(errors suppressed with '2>/dev/null || true' for optional files)
- Deduplicate with 'sort -u' before assigning to pgalist; controls
that appear in multiple topology files are tested only once
multiple-pipeline.sh:
- Declare global associative array USED_PCMS before main loop
- In func_run_pipeline_with_type(): check USED_PCMS[$dev]; skip with
log message if already tested; otherwise mark and proceed
- Reset USED_PCMS=() at start of each loop iteration so every
full pass starts with clean slate
Signed-off-by: Mateusz Junkier <mateusz.junkier@intel.com>1 parent bd396c8 commit 3768bfe
3 files changed
Lines changed: 78 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
89 | 92 | | |
90 | 93 | | |
91 | 94 | | |
| |||
114 | 117 | | |
115 | 118 | | |
116 | 119 | | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
117 | 127 | | |
118 | 128 | | |
119 | 129 | | |
| |||
180 | 190 | | |
181 | 191 | | |
182 | 192 | | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
183 | 196 | | |
184 | 197 | | |
185 | 198 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | | - | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
24 | | - | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
44 | | - | |
45 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
46 | 58 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
56 | 86 | | |
57 | 87 | | |
58 | | - | |
59 | | - | |
60 | | - | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
61 | 92 | | |
62 | 93 | | |
63 | 94 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
56 | 72 | | |
57 | 73 | | |
58 | 74 | | |
| |||
0 commit comments