From b51a9471794b5fd38aea4c9591da34113e6b82b3 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Thu, 26 Nov 2020 15:30:55 +1000 Subject: [PATCH] run-make-check.sh: Make sure a build failure will exit We 'set -e' but that is ignored because 'build tests' is executed in a '&&' list (see 'man set') so move the echo to the following line. Follow-up to 03ff2146f95 Signed-off-by: Brad Hubbard (cherry picked from commit e70483133db87a3f04bc1fff31d8472465c305b3) Conflicts: run-make-check.sh: cmake call differences and trivial logging output change. --- run-make-check.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-make-check.sh b/run-make-check.sh index 7dffc549b3e8..1927c4594dd3 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -57,7 +57,8 @@ function main() { FOR_MAKE_CHECK=1 prepare # Init defaults after deps are installed. configure "-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DENABLE_GIT_VERSION=OFF $@" - build tests && echo "make check: successful run on $(git rev-parse HEAD)" + build tests + echo "make check: successful build on $(git rev-parse HEAD)" run } -- 2.47.3