Skip to content

TEST IGNORE BREAK topologies with some whitespace #5639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marc-hb wants to merge 3 commits into from
Closed

TEST IGNORE BREAK topologies with some whitespace #5639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aff5ee7
BREAK topologies with some whitespace
marc-hb Apr 1, 2022
1936acb
topologies: docker --env USE_XARGS, NO_PROCESSORS and VERBOSE
marc-hb Apr 1, 2022
19442a4
.github: build again single-threaded and verbose on failure
marc-hb Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/installer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ jobs:
run: docker pull thesofproject/sof && docker tag thesofproject/sof sof

# -j3 tests the ability to build multiple platforms
# concurrently. It makes the build log unreadable but that's OK
# because we have other, slower actions with readable logs.
# concurrently. It makes the build log unreadable, so retry with
# a single thread in case of failure
- name: build all and stage
run: ./scripts/docker-run.sh make -j3 -C installer/ tarball
run: ./scripts/docker-run.sh make -j3 -C installer/ tarball ||
VERBOSE=1 NO_PROCESSORS=1 USE_XARGS=no
./scripts/docker-run.sh make -j1 -C installer/ tarball

- name: check staging tree
run: make -C installer/ checktree
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ jobs:
# bug in ALSA 1.2.2
# https://github.com/thesofproject/sof/issues/2543
- name: build topologies
run: ./scripts/docker-run.sh ./scripts/build-tools.sh -t
run: ./scripts/docker-run.sh ./scripts/build-tools.sh -t ||
VERBOSE=1 USE_XARGS=no
./scripts/docker-run.sh ./scripts/build-tools.sh -t

- name: build testbench
run: ./scripts/rebuild-testbench.sh
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ jobs:
# For some reason gcc has more warnings in Release mode
- name: build-tools
run: CMAKE_BUILD_TYPE=Release ./scripts/docker-run.sh
./scripts/build-tools.sh ||
VERBOSE=1 NO_PROCESSORS=1 USE_XARGS=no
CMAKE_BUILD_TYPE=Release ./scripts/docker-run.sh
./scripts/build-tools.sh
3 changes: 3 additions & 0 deletions scripts/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ docker run -i -v "${SOF_TOP}":/home/sof/work/sof.git \
-v "${SOF_TOP}":/home/sof/work/sof-bind-mount-DO-NOT-DELETE \
--env CMAKE_BUILD_TYPE \
--env PRIVATE_KEY_OPTION \
--env USE_XARGS \
--env NO_PROCESSORS \
--env VERBOSE \
--env http_proxy="$http_proxy" \
--env https_proxy="$https_proxy" \
--user "$(id -u)" \
Expand Down
4 changes: 3 additions & 1 deletion tools/test/topology/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ file(GLOB TPLG_DEPS

find_program(XARGS NAMES xargs PATHS ENV PATH NO_DEFAULT_PATH)

if(${XARGS} STREQUAL XARGS-NOTFOUND)
if(${XARGS} STREQUAL XARGS-NOTFOUND OR
(DEFINED ENV{USE_XARGS} AND NOT $ENV{USE_XARGS} STREQUAL "yes")
)
set(USE_XARGS "no")
else()
set(USE_XARGS "yes")
Expand Down
2 changes: 1 addition & 1 deletion tools/test/topology/test-capture.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ include(`test_pipeline_filters.m4')
PIPELINE_PCM_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
2, 0, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)
8000, 192000 , 48000)

#
# DAI configuration
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/development/sof-cml-src-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
5, 3, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
48000 ,48000 ,48000)

# Low Latency playback pipeline 6 on PCM 4 using max 2 channels of s32le.
# Set 1000us deadline with priority 0 on core 0
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ include(`platform/intel/intel-generic-dmic-kwd.m4')
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
6, 5, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
48000, 48000 , 48000)

# Low Latency playback pipeline 7 on PCM 6 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline with priority 0 on core 0
Expand Down