From a5b4dfa63d2bf89a48671e1bf756b9dcde9832f4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 26 Feb 2015 17:53:46 +0000 Subject: [PATCH 4/9] installed-tests: declare that the output is in TAP format For the ones written using GLib, the output is in TAP format if we say --tap. For the one not written using GLib, the output is in TAP and the command-line is ignored. --- test/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index f384859..3cf1d74 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -473,12 +473,14 @@ $(installable_test_meta): %.test: %$(EXEEXT) Makefile $(AM_V_GEN) ( \ echo '[Test]'; \ echo 'Type=session'; \ - echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp $(testexecdir)/$*'; \ + echo 'Output=TAP'; \ + echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp $(testexecdir)/$* --tap'; \ ) > $@.tmp && mv $@.tmp $@ $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile $(AM_V_GEN) ( \ echo '[Test]'; \ echo 'Type=session'; \ - echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$*'; \ + echo 'Output=TAP'; \ + echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$* --tap'; \ ) > $@.tmp && mv $@.tmp $@ -- 2.1.4