[gvfs] More work on the test suite running

[Alexander Larsson <alexl src gnome org>]

commit d013022a84b16c10628902d3f711eea98982269c
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Oct 12 10:48:15 2012 +0200

    More work on the test suite running
    
    We now also load the gio module and the gvfs
    monitor files from the build tree. Also
    fixes up make clean a bit more.

 test/Makefile.am    |   29 ++++++++++++++++++-----------
 test/run-in-tree.sh |    2 ++
 2 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/test/Makefile.am b/test/Makefile.am
index bf9ca89..3722c46 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,39 +25,46 @@ gvfs-daemon.service: $(top_srcdir)/daemon/gvfs-daemon.service.in ../config.log
 gvfs-metadata.service: $(top_srcdir)/metadata/gvfs-metadata.service.in ../config.log
 	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/metadata|" $< > $@
 
-noinst_DATA= session.conf gvfs-daemon.service gvfs-metadata.service
+%.monitor:
+	$(AM_V_GEN) ln -s $(top_srcdir)/monitor/$(*F)/$(@F) $@
+
+CONFIG_FILES=session.conf gvfs-daemon.service gvfs-metadata.service
 
 if USE_AFC
 org.gtk.Private.AfcVolumeMonitor.service: $(top_srcdir)/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor//afc|" $< > $@
-noinst_DATA+=org.gtk.Private.AfcVolumeMonitor.service
+	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/afc|" $< > $@
+CONFIG_FILES+=org.gtk.Private.AfcVolumeMonitor.service afc.monitor
 endif
 
 if USE_GDU
 org.gtk.Private.GduVolumeMonitor.service: $(top_srcdir)/monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor//gdu|" $< > $@
-noinst_DATA+=org.gtk.Private.GduVolumeMonitor.service
+	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/gdu|" $< > $@
+CONFIG_FILES+=org.gtk.Private.GduVolumeMonitor.service gdu.monitor
 endif
 
 if USE_GPHOTO2
 org.gtk.Private.GPhoto2VolumeMonitor.service: $(top_srcdir)/monitor/gphoto2/org.gtk.Private.GPhoto2VolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor//gphoto2|" $< > $@
-noinst_DATA+=org.gtk.Private.GPhoto2VolumeMonitor.service
+	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/gphoto2|" $< > $@
+CONFIG_FILES+=org.gtk.Private.GPhoto2VolumeMonitor.service gphoto2.monitor
 endif
 
 if USE_HAL
 org.gtk.Private.HalVolumeMonitor.service: $(top_srcdir)/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor//hal|" $< > $@
-noinst_DATA+=org.gtk.Private.HalVolumeMonitor.service
+	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/hal|" $< > $@
+CONFIG_FILES+=org.gtk.Private.HalVolumeMonitor.service hal.monitor
 endif
 
 if USE_UDISKS2
 org.gtk.Private.UDisks2VolumeMonitor.service: $(top_srcdir)/monitor/udisks2/org.gtk.Private.UDisks2VolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor//udisks2|" $< > $@
-noinst_DATA+=org.gtk.Private.UDisks2VolumeMonitor.service
+	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(abs_top_builddir)/monitor/udisks2|" $< > $@
+CONFIG_FILES+=org.gtk.Private.UDisks2VolumeMonitor.service udisks2.monitor
 endif
 
+noinst_DATA= $(CONFIG_FILES)
+
 test: session.conf gvfs-daemon.service gvfs-metadata.service
 	./run-in-tree.sh ./gvfs-test
 
+CLEANFILES=$(CONFIG_FILES)
+
 EXTRA_DIST = benchmark-common.c session.conf.in gvfs-test
diff --git a/test/run-in-tree.sh b/test/run-in-tree.sh
index 9cb638f..1b00946 100755
--- a/test/run-in-tree.sh
+++ b/test/run-in-tree.sh
@@ -8,7 +8,9 @@ fi
 # Set up env vars to make gvfs read mounts from the build tree
 export GVFS_MOUNTABLE_EXTENSION=".localmount"
 export GVFS_MOUNTABLE_DIR=`pwd`/../daemon
+export GVFS_MONITOR_DIR=`pwd`
 export PATH=`pwd`/../programs:$PATH
+export GIO_EXTRA_MODULES=`pwd`/../client/.libs:`pwd`/../monitor/proxy/.libs
 
 # Start a custom session dbus
 PIDFILE=`mktemp`