installcheck: don't run installed tests against installed library if in a DESTDIR
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 8 Jun 2011 17:47:14 +0000 (18:47 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Jun 2011 17:32:40 +0000 (18:32 +0100)
That probably won't work, because it'll find the system-wide library
which might be older.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570

test/Makefile.am

index be59403..e74a8d3 100644 (file)
@@ -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) \