From 5a3425d17cbf81e7bc00d3a6650cb65b3be3c98d Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 14 Dec 2023 15:06:46 +0100 Subject: [PATCH] test: don't check for -Dinstall-tests=true with NO_BUILD=1 (cherry picked from commit 58bcbad86cc910e007fae3c66c3a5cfc17046801) Gbp-Pq: Name test-don-t-check-for-Dinstall-tests-true-with-NO_BUILD-1.patch --- test/test-functions | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test-functions b/test/test-functions index 8f04a37d..948a00bc 100644 --- a/test/test-functions +++ b/test/test-functions @@ -3345,9 +3345,10 @@ test_create_image() { } test_setup() { - if get_bool "${TEST_REQUIRE_INSTALL_TESTS:?}" && \ - command -v meson >/dev/null && \ - [[ "$(meson configure "${BUILD_DIR:?}" | grep install-tests | awk '{ print $2 }')" != "true" ]]; then + if ! get_bool "$NO_BUILD" && \ + get_bool "${TEST_REQUIRE_INSTALL_TESTS:?}" && \ + command -v meson >/dev/null && \ + [[ "$(meson configure "${BUILD_DIR:?}" | grep install-tests | awk '{ print $2 }')" != "true" ]]; then dfatal "$BUILD_DIR needs to be built with -Dinstall-tests=true" exit 1 fi -- 2.30.2