From 58dcb9574468cdd31147e3c5c9c824da543b378f Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 28 Aug 2020 18:09:30 +0000 Subject: [PATCH 1/2] host-build-all.sh: print deprecation warning Use newer rebuild-testbench.sh instead, added by commit 46578cb103e4 ("scripts: Add a new script to rebuild testbench") Signed-off-by: Marc Herbert --- scripts/host-build-all.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/host-build-all.sh b/scripts/host-build-all.sh index d56885e5c3c0..9335485d994a 100755 --- a/scripts/host-build-all.sh +++ b/scripts/host-build-all.sh @@ -5,6 +5,14 @@ # fail on any errors set -e +deprecated() +{ + >&2 printf "\nWARNING: %s is deprecated, use newer rebuild-testbench.sh\n\n" \ + "$0" +} + +deprecated + cd tools cd testbench @@ -19,3 +27,5 @@ cmake -DCMAKE_INSTALL_PREFIX=install \ make -j$(nproc --all) make install + +deprecated From e07d19d5a98c86074f8d9496d58c70d0d2a9f008 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 28 Aug 2020 18:23:45 +0000 Subject: [PATCH 2/2] .travis.yml: switch to newer rebuild-testbench.sh Also stop hiding errors in topologies build. Signed-off-by: Marc Herbert --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40704af59849..bf38dcb7ba5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,8 +76,9 @@ jobs: - name: testbench before_install: *docker-pull-sof script: - - ./scripts/docker-run.sh ./scripts/build-tools.sh -t &> /dev/null - - ./scripts/docker-run.sh ./scripts/host-build-all.sh + # testbench needs some topologies + - ./scripts/docker-run.sh ./scripts/build-tools.sh -t + - ./scripts/docker-run.sh ./scripts/rebuild-testbench.sh - ./scripts/host-testbench.sh