diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-08 18:47:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-10 18:32:40 +0100 |
| commit | 983fd362645beab59cf43fc5d68e4f6ac7a8bbeb (patch) | |
| tree | baf5b65d43cfcc005fe94be5a5493766ebb4b335 /test | |
| parent | 715fa5c0d53d8a6c471911d0376ea34ebabfd8d6 (diff) | |
| download | dbus-983fd362645beab59cf43fc5d68e4f6ac7a8bbeb.tar.gz | |
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.
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index be594038..e74a8d39 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) \ |