commit c1c6a9d482822f3da8043b8203c4b69bffbf2b46
author Roland McGrath <roland@hack.frob.com> Tue Feb 21 20:51:36 2012
committer Roland McGrath <roland@hack.frob.com> Tue Feb 21 20:51:36 2012
tree 65cc9c2ae2639cf0fd06346dc4bb79d922a446a1
parent e3b15685566f6ddcad47c820e77737c2c3c851e4

test-subr.sh: Add ${libdir}/elfutils to LD_LIBRARY_PATH.

tests/ChangeLog

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 38b189d..028055b 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>
 

tests/test-subr.sh

diff --git a/tests/test-subr.sh b/tests/test-subr.sh
index cb34b93..fb7a329 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 @@
     ;;
   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+"$@"}