From d752d07a543227e9adb23ab62b21799474ea0d17 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 26 Feb 2015 17:53:46 +0000 Subject: [PATCH] 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. Reviewed-by: Philip Withnall Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846 --- test/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index f38485990..3cf1d7458 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.47.3