diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-02-21 12:51:36 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-02-21 12:51:36 -0800 |
| commit | c1c6a9d482822f3da8043b8203c4b69bffbf2b46 (patch) | |
| tree | 65cc9c2ae2639cf0fd06346dc4bb79d922a446a1 | |
| parent | e3b15685566f6ddcad47c820e77737c2c3c851e4 (diff) | |
| download | elfutils-c1c6a9d482822f3da8043b8203c4b69bffbf2b46.tar.gz | |
test-subr.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH.
| -rw-r--r-- | tests/ChangeLog | 1 | ||||
| -rw-r--r-- | tests/test-subr.sh | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 38b189d5..028055b5 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,6 +1,7 @@ 2012-02-21 Roland McGrath <roland@hack.frob.com> * test-wrapper.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH. + * test-subr.sh (installed_testrun): Likewise. 2012-01-18 Roland McGrath <roland@hack.frob.com> diff --git a/tests/test-subr.sh b/tests/test-subr.sh index cb34b93b..fb7a329d 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+"$@"} |