diff options
| author | Roland McGrath <[email protected]> | 2012-02-21 11:12:46 -0800 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2012-02-21 11:12:46 -0800 |
| commit | e3b15685566f6ddcad47c820e77737c2c3c851e4 (patch) | |
| tree | be52a68571a95c1cbab8a204ccc5675d0ff08cfd /tests/test-wrapper.sh | |
| parent | cb643d6731f3b0131e34e055272c694bd0bf97ed (diff) | |
test-wrapper.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH.
Diffstat (limited to 'tests/test-wrapper.sh')
| -rwxr-xr-x | tests/test-wrapper.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/test-wrapper.sh b/tests/test-wrapper.sh index 3477e382..12ab04e3 100755 --- a/tests/test-wrapper.sh +++ b/tests/test-wrapper.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005 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 @@ -46,6 +46,8 @@ else elfutils_testrun=built fi +old_path="${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + case "$1" in *.sh) export built_library_path program_transform_name elfutils_testrun @@ -53,15 +55,14 @@ case "$1" in ;; *) if [ $elfutils_testrun = built ]; then - LD_LIBRARY_PATH="$built_library_path${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH + LD_LIBRARY_PATH="$built_library_path$old_path" elif [ $elfutils_tests_rpath = yes ]; then echo >&2 installcheck not possible with --enable-tests-rpath exit 77 elif [ "x$libdir" != x/usr/lib ] && [ "x$libdir" != x/usr/lib64 ]; then - LD_LIBRARY_PATH="$libdir${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH + LD_LIBRARY_PATH="${libdir}:${libdir}/elfutils$old_path" fi + export LD_LIBRARY_PATH ;; esac |