diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-09 11:07:53 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-09 11:11:55 +0200 |
| commit | 8abbc0186efe977cec2a3214e7aa3703e9f1169f (patch) | |
| tree | f02d20ec637609e32d473e45b1ad8b6a8a6de281 /tests/Makefile.am.inc | |
| parent | ba37b22d78f3b1011ceab182c8a4a05d5ba630a7 (diff) | |
| download | xdg-app-8abbc0186efe977cec2a3214e7aa3703e9f1169f.tar.gz | |
Rename everything but the on-disk location to flatpak
Diffstat (limited to 'tests/Makefile.am.inc')
| -rw-r--r-- | tests/Makefile.am.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc index c9ef3f1..dc30509 100644 --- a/tests/Makefile.am.inc +++ b/tests/Makefile.am.inc @@ -1,7 +1,7 @@ TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \ FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \ FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \ - FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \ + FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \ GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \ LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \ PATH=$$(cd $(top_builddir) && pwd):$${PATH} \ @@ -25,22 +25,22 @@ test_doc_portal_LDADD = \ $(NULL) test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources) -EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.XdgApp.service +EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.Flatpak.service tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in mkdir -p tests/services $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@ -tests/services/org.freedesktop.XdgApp.service: session-helper/org.freedesktop.XdgApp.service.in +tests/services/org.freedesktop.Flatpak.service: session-helper/org.freedesktop.Flatpak.service.in mkdir -p tests/services $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@ -tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.XdgApp.service +tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service tests/services/org.freedesktop.Flatpak.service install-test-data-hook: if ENABLE_INSTALLED_TESTS mkdir -p $(DESTDIR)$(installed_testdir)/services - ln -sf $(dbus_servicedir)/org.freedesktop.XdgApp.service $(DESTDIR)$(installed_testdir)/services/ + ln -sf $(dbus_servicedir)/org.freedesktop.Flatpak.service $(DESTDIR)$(installed_testdir)/services/ ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/ endif @@ -76,9 +76,9 @@ test_scripts = \ test_programs = testdb test-doc-portal @VALGRIND_CHECK_RULES@ -VALGRIND_SUPPRESSIONS_FILES=tests/xdg-app.supp -EXTRA_DIST += tests/xdg-app.supp tests/dbs/no_tables +VALGRIND_SUPPRESSIONS_FILES=tests/flatpak-valgrind.supp +EXTRA_DIST += tests/flatpak-valgrind.supp tests/dbs/no_tables CLEANFILES += \ - tests/services/org.freedesktop.XdgApp.service \ + tests/services/org.freedesktop.Flatpak.service \ tests/services/org.freedesktop.portal.Documents.service \ $(NULL) |