diff options
| author | Ondrej Holy <oholy@redhat.com> | 2016-05-26 13:25:24 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2016-05-30 12:47:44 +0200 |
| commit | 0188305b2537370c807fd9e359084647533f5f4b (patch) | |
| tree | 2d0c66258b5994f94e9794fb09a9a79e05316ddd /test | |
| parent | 0e78e53866eb88897436e47412c06b67041ef6dd (diff) | |
| download | gvfs-0188305b2537370c807fd9e359084647533f5f4b.tar.gz | |
test: Use system paths in installed tests
Installed tests are still using buildroot paths, which causes test
failures if buildroot is not available. System paths has to be used
instead for the installed tests.
https://bugzilla.gnome.org/show_bug.cgi?id=734370
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index f7dca6e1..02239e7c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -19,7 +19,7 @@ noinst_PROGRAMS += \ $(NULL) session.conf: session.conf.in ../config.log - $(AM_V_GEN) $(SED) -e "s|\@testdir\@|$(abs_builddir)|" $< > $@ + $(AM_V_GEN) $(SED) -e "s|\@testdir\@|.|" $< > $@ org.gtk.vfs.Daemon.service: $(top_srcdir)/daemon/org.gtk.vfs.Daemon.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/daemon|" $< > $@ @@ -31,35 +31,41 @@ org.gtk.vfs.Metadata.service: $(top_srcdir)/metadata/org.gtk.vfs.Metadata.servic $(AM_V_GEN) ln -s $(top_srcdir)/monitor/$(*F)/$(@F) $@ CONFIG_FILES=session.conf org.gtk.vfs.Daemon.service org.gtk.vfs.Metadata.service +CONFIG_FILES_INSTALLED=session.conf $(top_srcdir)/daemon/org.gtk.vfs.Daemon.service $(top_srcdir)/metadata/org.gtk.vfs.Metadata.service if USE_AFC org.gtk.vfs.AfcVolumeMonitor.service: $(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/afc|" $< > $@ CONFIG_FILES+=org.gtk.vfs.AfcVolumeMonitor.service afc.monitor +CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service afc.monitor endif if USE_GDU org.gtk.vfs.GduVolumeMonitor.service: $(top_srcdir)/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gdu|" $< > $@ CONFIG_FILES+=org.gtk.vfs.GduVolumeMonitor.service gdu.monitor +CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/afc/org.gtk.vfs.GduVolumeMonitor.service gdu.monitor endif if USE_GPHOTO2 org.gtk.vfs.GPhoto2VolumeMonitor.service: $(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gphoto2|" $< > $@ CONFIG_FILES+=org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor +CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor endif if USE_HAL org.gtk.vfs.HalVolumeMonitor.service: $(top_srcdir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/hal|" $< > $@ CONFIG_FILES+=org.gtk.vfs.HalVolumeMonitor.service hal.monitor +CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service hal.monitor endif if USE_UDISKS2 org.gtk.vfs.UDisks2VolumeMonitor.service: $(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/udisks2|" $< > $@ CONFIG_FILES+=org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor +CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor endif noinst_DATA += $(CONFIG_FILES) @@ -79,7 +85,7 @@ installcheck-local: gvfs-test CLEANFILES += $(CONFIG_FILES) -nobase_installed_test_DATA += $(CONFIG_FILES) +installed_test_DATA = $(CONFIG_FILES_INSTALLED) nobase_installed_test_DATA += \ files/source-gphoto/IMG_0001.jpg \ files/source-gphoto/IMG_0002.jpg \ @@ -95,7 +101,6 @@ nobase_installed_test_DATA += \ test_extra_scripts = \ gvfs-test \ - run-in-tree.sh \ $(NULL) test_scripts = gvfs-all-tests |