diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2014-08-06 18:15:12 +0200 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2014-08-27 18:00:46 +0200 |
| commit | 622024a88f842cb087306e81e886af850107149a (patch) | |
| tree | 75ad871e548663a901a5ff9ec9eff9e2a9a4698f /test | |
| parent | 7955e6333507b69a1d013c70376fb4b279df2556 (diff) | |
| download | gvfs-622024a88f842cb087306e81e886af850107149a.tar.gz | |
build: add --enable-installed-tests parameter
See https://live.gnome.org/GnomeGoals/InstalledTests for more information.
Those tests will also be executed on http://build.gnome.org. For now we run
all our suite as one big test
It's still possible to run `make check` with locally uninstalled tests.
https://bugzilla.gnome.org/show_bug.cgi?id=734370
Diffstat (limited to 'test')
| -rw-r--r-- | test/.gitignore | 1 | ||||
| -rw-r--r-- | test/Makefile.am | 42 |
2 files changed, 39 insertions, 4 deletions
diff --git a/test/.gitignore b/test/.gitignore index 18768c12..c361cbf2 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,5 +1,6 @@ *.monitor *.service +*.test session.conf benchmark-gvfs-big-files benchmark-gvfs-small-files diff --git a/test/Makefile.am b/test/Makefile.am index 1922ff53..1cd7b0b4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/glib-tap.mk + NULL = AM_CFLAGS = \ @@ -8,7 +10,7 @@ AM_CFLAGS = \ AM_LDFLAGS = \ $(GLIB_LIBS) -noinst_PROGRAMS = \ +noinst_PROGRAMS += \ test-query-info-stream \ benchmark-gvfs-small-files \ benchmark-gvfs-big-files \ @@ -60,7 +62,7 @@ org.gtk.Private.UDisks2VolumeMonitor.service: $(top_srcdir)/monitor/udisks2/org. CONFIG_FILES+=org.gtk.Private.UDisks2VolumeMonitor.service udisks2.monitor endif -noinst_DATA= $(CONFIG_FILES) +noinst_DATA += $(CONFIG_FILES) # run tests against build tree check: $(CONFIG_FILES) gvfs-test @@ -75,9 +77,41 @@ installcheck-local: gvfs-test $(srcdir)/gvfs-test $(TEST_NAMES); \ fi -CLEANFILES=$(CONFIG_FILES) +CLEANFILES += $(CONFIG_FILES) + +nobase_installed_test_DATA += $(CONFIG_FILES) +nobase_installed_test_DATA += \ + files/source-gphoto/IMG_0001.jpg \ + files/source-gphoto/IMG_0002.jpg \ + files/bogus-cd.iso.bz2 \ + files/joliet.iso.bz2 \ + files/mtp_xperia.ioctl.xz \ + files/mtp_xperia.umockdev \ + files/powershot.ioctl \ + files/powershot.umockdev \ + files/ssh_host_rsa_key \ + files/ssh_host_rsa_key.pub \ + files/testcert.pem \ + files/vfat.img.bz2 \ + $(NULL) + +test_extra_scripts = \ + gvfs-test \ + run-in-tree.sh \ + $(NULL) + +test_scripts = gvfs-all-tests + +gvfs-all-tests.test: gvfs-test + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_testdir)/gvfs-test' >> $@.tmp; \ + echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + +.PHONY: $(test_scripts) -EXTRA_DIST = \ +EXTRA_DIST += \ benchmark-common.c \ session.conf.in \ gvfs-test \ |