shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-08 09:57:41 +03:00
Code

test: do not run 'meson configure' if NO_BUILD is set

Browse Source 
There is no build tree and packages are used, so it cannot work. Unlikely
that static linking has been set for those builds anyway.

Fixes https://github.com/systemd/systemd/issues/19955
This commit is contained in:
Luca Boccassi 2021-06-16 21:50:23 +01:00 committed by Yu Watanabe
parent 5601400e17
commit 63878c52be
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/test-functions
View File

@ -1006,11 +1006,13 @@ create_empty_image() {
fi fi
local size=500 local size=500
if meson configure "${BUILD_DIR:?}" | grep 'static-lib\|standalone-binaries' | awk '{ print $2 }' | grep -q 'true'; then if [ -z "$NO_BUILD" ]; then
size=$((size+=200)) if meson configure "${BUILD_DIR:?}" | grep 'static-lib\|standalone-binaries' | awk '{ print $2 }' | grep -q 'true'; then
fi size=$((size+=200))
if meson configure "${BUILD_DIR:?}" | grep 'link-.*-shared' | awk '{ print $2 }' | grep -q 'false'; then fi
size=$((size+=200)) if meson configure "${BUILD_DIR:?}" | grep 'link-.*-shared' | awk '{ print $2 }' | grep -q 'false'; then
size=$((size+=200))
fi
fi fi
if [[ "$STRIP_BINARIES" = "no" ]]; then if [[ "$STRIP_BINARIES" = "no" ]]; then
size=$((4 * size)) size=$((4 * size))