fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-06 16:30:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Avoid misleading diagnostic when some tests are skipped

Browse source 
If we have 7 test-cases, of which we ran 3 and skipped 4, then it's
misleading to say "7 tests passed". Diagnose this as
"3 tests passed (4 skipped)" instead.

We can either skip tests by putting a specific test name on the test
command-line, or programmatically (for example the fd-passing test is
always skipped on Windows, because Windows cannot implement Unix
fd-passing).

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/363
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2021-12-15 12:31:54 +00:00 • committed by Ralf Habacker
parent be5873f1bb
commit fedb33179e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dbus/dbus-test-tap.c
View file

@ -39,6 +39,7 @@
#include <stdlib.h>
static unsigned int failures = 0;
static unsigned int skipped = 0;
static unsigned int tap_test_counter = 0;
/*
@ -148,6 +149,7 @@ _dbus_test_skip (const char *format,
va_list ap;
printf ("ok %u # SKIP ", ++tap_test_counter);
++skipped;
va_start (ap, format);
vprintf (format, ap);
va_end (ap);
@ -194,10 +196,14 @@ _dbus_test_check_memleaks (const char *test_name)
int
_dbus_test_done_testing (void)
{
_dbus_assert (skipped <= tap_test_counter);
if (failures == 0)
_dbus_test_diag ("%u tests passed", tap_test_counter);
_dbus_test_diag ("%u tests passed (%d skipped)",
tap_test_counter - skipped, skipped);
else
_dbus_test_diag ("%u/%u tests failed", failures, tap_test_counter);
_dbus_test_diag ("%u/%u tests failed (%d skipped)",
failures, tap_test_counter - skipped, skipped);
printf ("1..%u\n", tap_test_counter);
fflush (stdout);