diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-02-13 11:08:43 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2019-02-13 11:08:43 +0100 |
| commit | 563ead7c4dc1e7f020e0ba41848d0f7e3600e140 (patch) | |
| tree | 3055cac08186b246220ab29c4825332e84cef198 | |
| parent | 41a9a684249cd47aef4d65f81180ee69aa358d71 (diff) | |
| parent | afb6250777f30b9e460278877e5e8d7e9707de17 (diff) | |
| download | shared-mime-info-563ead7c4dc1e7f020e0ba41848d0f7e3600e140.tar.gz | |
Merge branch 'wip/hadess/make-ci-fail'
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 19adff94..b57c0fa9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,7 +120,8 @@ else mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \ cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \ XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" $(top_builddir)/update-mime-database$(EXEEXT) "$(top_builddir)/temp-mime-dir/mime/" ; \ - XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" XDG_DATA_HOME="$(top_builddir)/temp-mime-dir/" $(XDGMIME_PATH)/src/test-mime-data$(EXEEXT) -v $(top_srcdir)/tests/list || XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" XDG_DATA_HOME="$(top_builddir)/temp-mime-dir/" $(XDGMIME_PATH)/src/test-mime$(EXEEXT) || (XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" $(XDGMIME_PATH)/src/test-mime-data$(EXEEXT) -v -v $(top_srcdir)/tests/list ; exit 1); \ + XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" XDG_DATA_HOME="$(top_builddir)/temp-mime-dir/" $(XDGMIME_PATH)/src/test-mime-data$(EXEEXT) -v $(top_srcdir)/tests/list || exit 1; \ + XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" XDG_DATA_HOME="$(top_builddir)/temp-mime-dir/" $(XDGMIME_PATH)/src/test-mime$(EXEEXT) || exit 1; \ XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" $(top_builddir)/test-tree-magic$(EXEEXT) $(top_srcdir)/tests/tree-list || exit 1; \ rm -rf "$(top_builddir)/temp-mime-dir/" ; \ fi; \ |