diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-04-28 13:04:14 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-04-28 13:04:14 +0200 |
| commit | b3303687615e88a1351cb7472402961956e26999 (patch) | |
| tree | e611e4b39b692568b031b2106da2b45a89856d34 /tests/Makefile.am.inc | |
| parent | 327f432219e767ac4f651dfa6b08ba030ec6e3e1 (diff) | |
| download | xdg-app-b3303687615e88a1351cb7472402961956e26999.tar.gz | |
Make installed tests work better
This involves e.g. having our own session bus with only our services in.
Diffstat (limited to 'tests/Makefile.am.inc')
| -rw-r--r-- | tests/Makefile.am.inc | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc index bf707d9..5c9b48f 100644 --- a/tests/Makefile.am.inc +++ b/tests/Makefile.am.inc @@ -4,7 +4,6 @@ TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \ PATH=$$(cd $(top_builddir) && pwd):$${PATH} \ $(NULL) -TEST_PROGS += testdb test-doc-portal testdb_CFLAGS = $(BASE_CFLAGS) -DDB_DIR=\"$(abs_srcdir)/tests/dbs\" testdb_LDADD = \ $(BASE_LIBS) \ @@ -23,6 +22,7 @@ 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 tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in mkdir -p tests/services @@ -32,15 +32,26 @@ tests/services/org.freedesktop.XdgApp.service: session-helper/org.freedesktop.Xd mkdir -p tests/services $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@ -test_doc_portal_DEPENDENCIES = 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.XdgApp.service + +install-data-hook: + mkdir -p $(DESTDIR)$(installed_testdir)/services + ln -sf $(dbus_servicedir)/org.freedesktop.XdgApp.service $(DESTDIR)$(installed_testdir)/services/ + ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/ check_PROGRAMS += $(TEST_PROGS) -installed_test_data = \ - tests/libtest.sh \ +installed_test_SCRIPTS += \ + buildutil/tap-driver.sh \ tests/make-test-app.sh \ tests/make-test-runtime.sh \ tests/make-test-bundles.sh \ + tests/libtest.sh \ + $(NULL) + +installed_test_data = \ + tests/org.test.Hello.png \ + tests/session.conf.in \ $(NULL) test_scripts = \ |