Skip to content

Commit 22e8a93

Browse files
committed
lib.sh: Reuse set_alsa()
Reuse set_alsa() function in test cases: check-alsa-conformance.sh check-alsabat.sh latency-metrics.sh Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
1 parent 2ccef4e commit 22e8a93

4 files changed

Lines changed: 15 additions & 36 deletions

File tree

case-lib/lib.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,6 +1246,19 @@ reset_sof_volume()
12461246
fi
12471247
done
12481248
}
1249+
1250+
set_alsa()
1251+
{
1252+
reset_sof_volume
1253+
1254+
# If MODEL is defined, set proper gain for the platform
1255+
if [ -z "$MODEL" ]; then
1256+
dlogw "NO MODEL is defined. Please define MODEL to run alsa_settings/\${MODEL}.sh"
1257+
else
1258+
set_alsa_settings "$MODEL"
1259+
fi
1260+
}
1261+
12491262
DO_PERF_ANALYSIS=0
12501263

12511264
perf_analyze()

test-case/check-alsa-conformance.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,6 @@ select_PCMs()
221221
done
222222
dlogi "Capture devices: ${CAPTURE_DEVICES[*]}"
223223
}
224-
225-
set_alsa()
226-
{
227-
reset_sof_volume
228-
229-
# If MODEL is defined, set proper gain for the platform
230-
if [ -z "$MODEL" ]; then
231-
dlogw "No MODEL is defined. Please define MODEL to run alsa_settings/\${MODEL}.sh"
232-
else
233-
set_alsa_settings "$MODEL"
234-
fi
235-
}
236224

237225
alsa_conformance_device_info()
238226
{

test-case/check-alsabat.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,10 @@ fi
8383

8484
check_locale_for_alsabat
8585

86-
# reset sof volume to 0dB
87-
reset_sof_volume
88-
89-
# If MODEL is defined, set proper gain for the platform
90-
if [ -z "$MODEL" ]; then
91-
# treat as warning only
92-
dlogw "NO MODEL is defined. Please define MODEL to run alsa_settings/MODEL.sh"
93-
else
94-
#dlogi "apply alsa settings for alsa_settings/MODEL.sh"
95-
set_alsa_settings "$MODEL"
96-
fi
97-
9886
logger_disabled || func_lib_start_log_collect
9987

88+
set_alsa
89+
10090
function __upload_wav_file
10191
{
10292
# upload the alsabat wav file

test-case/latency-metrics.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,6 @@ check_latency_options()
142142
fi
143143
}
144144

145-
set_alsa()
146-
{
147-
reset_sof_volume
148-
149-
# If MODEL is defined, set proper gain for the platform
150-
if [ -z "$MODEL" ]; then
151-
dlogw "NO MODEL is defined. Please define MODEL to run alsa_settings/MODEL.sh"
152-
else
153-
set_alsa_settings "$MODEL"
154-
fi
155-
}
156-
157145
# set/update commands in case the test iterates or sweep over a range
158146
compose_commands()
159147
{

0 commit comments

Comments
 (0)