summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2012-10-12 11:47:55 +0200
committerAlexander Larsson <alexl@redhat.com>2012-10-12 11:47:55 +0200
commita63c5a932c59bf61c74871736df941685ae3e96e (patch)
treee1d5ce264358dc97982c33b681756fd382b935b2
parentebcc67f826d27c71776b06e3ddd629e0056dd9e0 (diff)
downloadgvfs-a63c5a932c59bf61c74871736df941685ae3e96e.tar.gz
tests: Fix distchecks
We were not correctly handling srcdir != builddir, and we were not distcleaning some files.xg
-rw-r--r--daemon/Makefile.am2
-rw-r--r--test/Makefile.am6
2 files changed, 4 insertions, 4 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b7f18676..7d6e6af9 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -133,7 +133,7 @@ EXTRA_DIST = \
$(gsettings_ENUM_FILES) \
$(NULL)
-DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
+DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) $(noinst_DATA)
CLEANFILES = \
$(gsettings__enum_file) \
diff --git a/test/Makefile.am b/test/Makefile.am
index 3722c465..26977b5a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -62,9 +62,9 @@ endif
noinst_DATA= $(CONFIG_FILES)
-test: session.conf gvfs-daemon.service gvfs-metadata.service
- ./run-in-tree.sh ./gvfs-test
+check: $(CONFIG_FILES) gvfs-test
+ $(srcdir)/run-in-tree.sh $(srcdir)/gvfs-test
CLEANFILES=$(CONFIG_FILES)
-EXTRA_DIST = benchmark-common.c session.conf.in gvfs-test
+EXTRA_DIST = benchmark-common.c session.conf.in gvfs-test run-in-tree.sh