From c1c6a9d482822f3da8043b8203c4b69bffbf2b46 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 21 Feb 2012 12:51:36 -0800 Subject: [PATCH] test-subr.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH. --- tests/ChangeLog | 1 + tests/test-subr.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 38b189d5f..028055b52 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,6 +1,7 @@ 2012-02-21 Roland McGrath * test-wrapper.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH. + * test-subr.sh (installed_testrun): Likewise. 2012-01-18 Roland McGrath diff --git a/tests/test-subr.sh b/tests/test-subr.sh index cb34b93bc..fb7a329db 100644 --- a/tests/test-subr.sh +++ b/tests/test-subr.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005, 2007, 2008 Red Hat, Inc. +# Copyright (C) 2005-2012 Red Hat, Inc. # This file is part of Red Hat elfutils. # # Red Hat elfutils is free software; you can redistribute it and/or modify @@ -99,7 +99,8 @@ installed_testrun() ;; esac if [ "${libdir}" != /usr/lib ] && [ "${libdir}" != /usr/lib64 ]; then - LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ + LD_LIBRARY_PATH="${libdir}:${libdir}/elfutils\ +${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ $program ${1+"$@"} else $program ${1+"$@"} -- 2.47.2