diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-11-14 17:20:40 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-11-15 12:12:40 +0000 |
| commit | ea43f3db48ad1ac01b47a2eab6b4567fbd968c45 (patch) | |
| tree | 5335c736a1f8f59b3944e60bdbeee2160b543ad6 /test | |
| parent | fc30e312ea98b3765983be03fcb08ae64ee48b2d (diff) | |
test-dbus: Produce machine-readable TAP output
See http://testanything.org/ for more information on TAP.
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index bc5bc1852..2721a4a90 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -70,28 +70,24 @@ TEST_BINARIES = \ ## These are conceptually part of directories that come earlier in SUBDIRS ## order, but we don't want to run them til we arrive in this directory, -## since they depend on stuff from this directory. We wrap them in a +## since they depend on stuff from this directory. We wrap some of them in a ## simple shell script to get TAP output. wrap_bus_tests = test-bus.sh -wrap_dbus_tests = test-dbus.sh if DBUS_UNIX wrap_bus_tests += test-bus-launch-helper.sh wrap_bus_tests += test-bus-system.sh endif -TESTS += $(wrap_bus_tests) $(wrap_dbus_tests) -CLEANFILES += $(wrap_bus_tests) $(wrap_dbus_tests) +TESTS += $(wrap_bus_tests) +TESTS += ../dbus/test-dbus$(EXEEXT) +CLEANFILES += $(wrap_bus_tests) $(wrap_bus_tests): test-bus%.sh: ../bus/test-bus%$(EXEEXT) tap-test.sh.in Makefile sed -e 's![@]RUN[@]!$<!' \ < $(srcdir)/tap-test.sh.in > $@ -$(wrap_dbus_tests): test-dbus%.sh: ../dbus/test-dbus%$(EXEEXT) tap-test.sh.in Makefile - sed -e 's![@]RUN[@]!$<!' \ - < $(srcdir)/tap-test.sh.in > $@ - else !DBUS_ENABLE_EMBEDDED_TESTS TEST_BINARIES= |