2005-11-17 Roland McGrath <roland@redhat.com>
+ * Makefile.am (installed_TESTS_ENVIRONMENT): Set libdir, bindir in
+ environment for test-wrapper.sh.
+ * test-wrapper.sh: Set LD_LIBRARY_PATH from ${libdir} if not /usr/lib.
+ * test-subr.sh (installed_testrun): Likewise.
+ Use explicit path in ${bindir}.
+
* Makefile.am (installcheck-local): Fix typo in last change.
2005-11-16 Roland McGrath <roland@redhat.com>
testfile22.bz2 testfile23.bz2 testfile24.bz2 testfile25.bz2 \
coverage.sh test-subr.sh test-wrapper.sh
-installed_TESTS_ENVIRONMENT = $(srcdir)/test-wrapper.sh \
+installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \
+ bindir=$(DESTDIR)$(bindir) \
+ $(srcdir)/test-wrapper.sh \
installed $(tests_rpath) \
$(program_transform_name)
if STANDALONE
fi
;;
../*)
- program=`program_transform ${program##*/}`
+ program=${bindir}/`program_transform ${program##*/}`
;;
esac
- $program ${1+"$@"}
+ if [ "${libdir}" != /usr/lib ]; then
+ LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
+ $program ${1+"$@"}
+ else
+ $program ${1+"$@"}
+ fi
}
program_transform()
elif [ $elfutils_tests_rpath = yes ]; then
echo >&2 installcheck not possible with --enable-tests-rpath
exit 77
+ elif [ "x$libdir" != x/usr/lib ]; then
+ LD_LIBRARY_PATH="$libdir${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH
fi
;;
esac