From 9365d2c3439c524c9ca0b9d70f0a559d392a7e05 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 18 Nov 2005 23:55:47 +0000 Subject: [PATCH] 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. tests/ 2005-11-18 Roland McGrath * test-subr.sh (installed_testrun): Treat /usr/lib64 like /usr/lib. * test-wrapper.sh: Likewise. --- ChangeLog | 4 ++++ Makefile.am | 7 +++++++ tests/ChangeLog | 5 +++++ tests/test-subr.sh | 2 +- tests/test-wrapper.sh | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92384a2db..1932f30f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-18 Roland McGrath + + * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. + 2005-11-16 Roland McGrath * configure.ac: Define HAVE_LIBASM and STANDALONE conditionals. diff --git a/Makefile.am b/Makefile.am index e7e93cdf6..0c4d92b9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,13 @@ SUBDIRS = $(mini_SUBDIRS) $(all_SUBDIRS) EXTRA_DIST = elfutils.spec GPG-KEY NOTES COPYING.GPL +# Make sure the test install uses lib64 when $LIB will yield lib64. +# Make sure the test build uses the same compiler, which on e.g. ppc64 +# determines which platform we are actually testing. +DISTCHECK_CONFIGURE_FLAGS = \ + --libdir=`echo $(libdir) | sed "s,^$(exec_prefix),$$dc_install_base,"`\ + CC="$(CC)" + distcheck-hook: chmod -R u+w $(distdir) diff --git a/tests/ChangeLog b/tests/ChangeLog index 31613f4eb..90223351e 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2005-11-18 Roland McGrath + + * test-subr.sh (installed_testrun): Treat /usr/lib64 like /usr/lib. + * test-wrapper.sh: Likewise. + 2005-11-17 Roland McGrath * Makefile.am (installed_TESTS_ENVIRONMENT): Set libdir, bindir in diff --git a/tests/test-subr.sh b/tests/test-subr.sh index 995c4951e..a0ef54497 100644 --- a/tests/test-subr.sh +++ b/tests/test-subr.sh @@ -82,7 +82,7 @@ installed_testrun() program=${bindir}/`program_transform ${program##*/}` ;; esac - if [ "${libdir}" != /usr/lib ]; then + if [ "${libdir}" != /usr/lib ] && [ "${libdir}" != /usr/lib64 ]; then LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ $program ${1+"$@"} else diff --git a/tests/test-wrapper.sh b/tests/test-wrapper.sh index a4f2a2182..4963ce257 100755 --- a/tests/test-wrapper.sh +++ b/tests/test-wrapper.sh @@ -45,7 +45,7 @@ case "$1" in elif [ $elfutils_tests_rpath = yes ]; then echo >&2 installcheck not possible with --enable-tests-rpath exit 77 - elif [ "x$libdir" != x/usr/lib ]; then + 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 fi -- 2.47.2