Skip to content

Commit 40f7dc4

Browse files
committed
option name changed
1 parent a867076 commit 40f7dc4

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Some tests support these environment variables (work in progress):
6464
- SOF_ALSA_OPTS contains optional parameters passed on both play and record.
6565
- SOF_APLAY_OPTS and SOF_ARECORD_OPTS contain optional parameters passed additionally on play and record respectively.
6666
These options are applied to the selected tool (alsa or tinyalsa) based on the value of SOF_ALSA_TOOL
67-
= TEST_WITH_PIPEWIRE (default: false) allows to use pipewire instead of ALSA direct mode. Currently only works with check-performance.sh.
67+
= SOF_TEST_PIPEWIRE (default: false) allows to use pipewire instead of ALSA direct mode. Currently only works with check-performance.sh.
6868

6969
Warning, these environment variables do NOT support parameters
7070
with whitespace or globbing characters, in other words this does NOT

case-lib/hijack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function func_exit_handler()
1212

1313
dlogi "Starting func_exit_handler($exit_status)"
1414

15-
if [ "$TEST_WITH_PIPEWIRE" == true ]; then
15+
if [ "$SOF_TEST_PIPEWIRE" == true ]; then
1616
func_lib_disable_pipewire
1717
fi
1818

case-lib/lib.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ minvalue() { printf '%d' $(( "$1" < "$2" ? "$1" : "$2" )); }
8383
#
8484
start_test()
8585
{
86-
if [ "$TEST_WITH_PIPEWIRE" == true ]; then
86+
if [ "$SOF_TEST_PIPEWIRE" == true ]; then
8787
func_lib_enable_pipewire
8888
fi
8989

@@ -961,7 +961,7 @@ aplay_opts()
961961
# shellcheck disable=SC2086
962962
tinyplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS -D "$card_nr" -d "$dev_nr" -i wav noise.wav
963963
elif [[ "$SOF_ALSA_TOOL" = "alsa" ]]; then
964-
if [[ "$TEST_WITH_PIPEWIRE" == true ]]; then
964+
if [[ "$SOF_TEST_PIPEWIRE" == true ]]; then
965965
dlogc "timeout -k 60 30 aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS $*" # option -d doesn't work with pipewire so we need timeout
966966
# shellcheck disable=SC2086
967967
timeout -k 60 30 aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS "$@"
@@ -986,7 +986,7 @@ arecord_opts()
986986
# shellcheck disable=SC2086
987987
tinycap $SOF_ALSA_OPTS $SOF_ARECORD_OPTS "$file" -D "$card_nr" -d "$dev_nr" -c "$channel" -t "$duration" -r "$rate" -b "$format"
988988
elif [[ "$SOF_ALSA_TOOL" = "alsa" ]]; then
989-
if [[ "$TEST_WITH_PIPEWIRE" == true ]]; then
989+
if [[ "$SOF_TEST_PIPEWIRE" == true ]]; then
990990
dlogc "timeout -k 60 30 arecord $SOF_ALSA_OPTS $SOF_ARECORD_OPTS $*" # option -d doesn't work with pipewire so we need timeout
991991
# shellcheck disable=SC2086
992992
timeout -k 60 30 arecord $SOF_ALSA_OPTS $SOF_ARECORD_OPTS "$@"

test-case/check-performance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func_pipeline_export "$tplg" "type:any"
5151
aplay_num=0
5252
arecord_num=0
5353

54-
if [ "$TEST_WITH_PIPEWIRE" == true ]; then
54+
if [ "$SOF_TEST_PIPEWIRE" == true ]; then
5555

5656
# aplay's for sinks
5757
pw_outputs_list=("Speaker" "Headphones" "HDMI")

test-case/pipewire-wrapper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
## It expects the test case script file name (without path) as the first parameter,
1010
## followed by other parameters required for that test case.
1111
## Case step:
12-
## 1. TEST_WITH_PIPEWIRE environment variable is set to true.
12+
## 1. SOF_TEST_PIPEWIRE environment variable is set to true.
1313
## 2. The test case script is executed.
1414
## Expected result:
1515
## The test case script is executed using Pipewire.
@@ -22,7 +22,7 @@ if [ -z "$1" ]; then
2222
exit 1
2323
fi
2424

25-
export TEST_WITH_PIPEWIRE=true
25+
export SOF_TEST_PIPEWIRE=true
2626

2727
TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
2828

0 commit comments

Comments
 (0)