From e99e6ee24423a3ab8ef628cf5bd15c17ebc9b537 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Jun 2011 18:47:14 +0100 Subject: [PATCH] installcheck: don't run installed tests against installed library if in a DESTDIR That probably won't work, because it'll find the system-wide library which might be older. --- test/Makefile.am | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index be59403..e74a8d3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -132,10 +132,14 @@ endif !DBUS_ENABLE_INSTALLED_TESTS endif DBUS_ENABLE_MODULAR_TESTS +# If we're installing the tests into a DESTDIR we can't run them +# again using the installed copy, because we don't know how to +# do a portable equivalent of setting LD_LIBRARY_PATH. installcheck-local: $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \ TESTS_ENVIRONMENT='$$(installcheck_environment)' if DBUS_ENABLE_INSTALLED_TESTS + test -n "$(DESTDIR)" || \ $(installcheck_environment) \ $(srcdir)/dbus-test-runner \ $(testexecdir) \ -- 1.7.5.3