]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: follow RUNPATH when installing missing libraries
authorFelipe Sateler <fsateler@gmail.com>
Sun, 3 Jul 2016 15:17:13 +0000 (11:17 -0400)
committerFelipe Sateler <fsateler@gmail.com>
Sun, 3 Jul 2016 22:33:02 +0000 (18:33 -0400)
Fixes #3630

test/test-functions

index 4583c02f972b1458d660d2b59e15c133b537b705..08a5c655550c3963385bf314f36287d2a7e3be08 100644 (file)
@@ -275,10 +275,15 @@ install_systemd() {
     echo LogLevel=debug >> $initdir/etc/systemd/system.conf
 }
 
+get_ldpath() {
+    local _bin="$1"
+    objdump -p "$_bin" 2>/dev/null | awk "/R(UN)?PATH/ { print \"$initdir\" \$2 }" | paste -sd :
+}
+
 install_missing_libraries() {
     # install possible missing libraries
     for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do
-        inst_libs $i
+        LD_LIBRARY_PATH=$(get_ldpath $i) inst_libs $i
     done
 }