diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-04-12 18:24:39 +0100 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-04-15 02:54:51 +0000 |
| commit | 8115489116aa85ec848318782cdb6c49400aaaf9 (patch) | |
| tree | 62a04100d2c0858eb6bccbb4b3c074f9ec6ee171 | |
| parent | fde0aa85d941f94f6ef70b989909f33d6692629b (diff) | |
| download | flatpak-8115489116aa85ec848318782cdb6c49400aaaf9.tar.gz | |
Use system copy of xdg-dbus-proxy for build-time tests if configured
This follows the same logic as the system bwrap.
Otherwise, build-time tests will fail when we are using a system
xdg-dbus-proxy and not compiling our own (the symptom is that testlibrary
hangs).
Signed-off-by: Simon McVittie <smcv@collabora.com>
Closes: #2823
Approved by: matthiasclasen
| -rw-r--r-- | tests/Makefile.am.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc index c28fc44e..e6e6c7ee 100644 --- a/tests/Makefile.am.inc +++ b/tests/Makefile.am.inc @@ -3,12 +3,17 @@ AM_TESTS_ENVIRONMENT = FLATPAK_TESTS_DEBUG=1 \ FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \ FLATPAK_VALIDATE_ICON=$$(cd $(top_builddir) && pwd)/flatpak-validate-icon \ FLATPAK_REVOKEFS_FUSE=$$(cd $(top_builddir) && pwd)/revokefs-fuse \ - FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \ GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \ LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd)$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ PATH=$$(cd $(top_builddir) && pwd):$${PATH} \ $(NULL) +if WITH_SYSTEM_DBUS_PROXY +AM_TESTS_ENVIRONMENT += FLATPAK_DBUSPROXY=$(DBUS_PROXY) +else +AM_TESTS_ENVIRONMENT += FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy +endif + if WITH_SYSTEM_BWRAP AM_TESTS_ENVIRONMENT += FLATPAK_BWRAP=$(BWRAP) else |