system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

test: ignore missing libudev when creating the test image

Browse source 
Same scenario as with libsystemd - ldd might use unprefixed RPATH, and
we install our own stuff into the image unconditionally anyway.

Also, bail out early if we hit a missing DSO with a possibly helpful
message.
This commit is contained in:
Frantisek Sumsal 2023-08-04 18:02:01 +02:00 committed by Yu Watanabe
parent 9afd4dde22
commit 04bce24d4e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/test-functions
View file

@ -2331,14 +2331,7 @@ inst_libs() {
[[ "$line" = 'not a dynamic executable' ]] && break
# Ignore errors about our own stuff missing. This is most likely caused
# by ldd attempting to use the unprefixed RPATH.
[[ "$line" =~ libsystemd.*\ not\ found ]] && continue
if [[ "$line" =~ $so_regex ]]; then
file="${BASH_REMATCH[1]}"
[[ -e "${initdir:?}/$file" ]] && continue
inst_library "$file"
continue
fi
[[ "$line" =~ (libsystemd|libudev).*\ not\ found ]] && continue
if [[ "$line" =~ not\ found ]]; then
dfatal "Missing a shared library required by $bin."
@ -2347,6 +2340,12 @@ inst_libs() {
dfatal "Cannot create a test image."
exit 1
fi
if [[ "$line" =~ $so_regex ]]; then
file="${BASH_REMATCH[1]}"
[[ -e "${initdir:?}/$file" ]] && continue
inst_library "$file"
fi
done < <(LC_ALL=C ldd "$bin" 2>/dev/null)
}