summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-01-19 18:39:50 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-01-20 14:04:52 +0900
commit6eab0c6dbab5c85cf6471e559b9a54da4ecd32ac (patch)
tree870cb233b3ccdc63805618669b37c53c7733aa21
parente327382877eb2d39db27b268923887d5aae1c286 (diff)
downloadsystemd-6eab0c6dbab5c85cf6471e559b9a54da4ecd32ac.tar.gz
Revert "test-functions: make sure we test our own libudev instead of the host libudev"
This reverts commit 73484ecff90f2cc235d827c0e955999bffe64dd0. 3976f372ae91e1cbe5ff9873aadfc2c43400452e moved libudev.so to be built in the main directory, so this addition to $LD_LIBRARY_PATH is now obsolete. After that commit, we build the following shared libraries: build/libnss_myhostname.so.2 build/libnss_mymachines.so.2 build/libnss_resolve.so.2 build/libnss_systemd.so.2 build/libsystemd.so.0.30.0 build/libudev.so.1.7.0 build/pam_systemd.so build/pam_systemd_home.so build/src/boot/efi/stub.so build/src/boot/efi/systemd_boot.so build/src/shared/libsystemd-shared-247.so EFI stubs don't matter, and libsystemd-shared-nnn.so is loaded through rpath, and is doesn't need to and shouldn't be in $LD_LIBRARY_PATH. In effect, we only ever need to add the main build directory to the search path.
-rw-r--r--test/test-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index 3df6db7ac0..14fdedaa85 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -692,7 +692,7 @@ get_ldpath() {
install_missing_libraries() {
# install possible missing libraries
for i in $initdir{,/usr}/{sbin,bin}/* $initdir{,/usr}/lib/systemd/{,tests/{,manual/,unsafe/}}*; do
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$(get_ldpath $i):$(get_ldpath $i)/src/udev" inst_libs $i
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$(get_ldpath $i)" inst_libs $i
done
# A number of dependencies is now optional via dlopen, so the install