From abf6346c5e65ec1ab1f83841e9bd07a2e301dde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 22 Sep 2020 00:00:59 +0200 Subject: [PATCH] test/run-integration-tests: do not run the tests if only "clean" is passed --- test/run-integration-tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index ac7a28cf2c..04b8385be9 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then else args="setup run clean-again" fi -args_no_clean=$(sed -r 's/(^| )clean($| )/ /g' <<<$args) +args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args) do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? ) ninja -C "$BUILD_DIR" @@ -26,6 +26,8 @@ if [ $do_clean = 1 ]; then for TEST in TEST-??-* ; do ( set -x ; make -C "$TEST" "BUILD_DIR=$BUILD_DIR" clean ) done + + [ -n "$args_no_clean" ] || exit 0 fi pass_blacklist() {