fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-04 23:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Interpret empty command-line arguments as --tap

Browse source 
AX_VALGRIND_CHECK overrides LOG_COMPILER, which means we can't rely
on running under glib-tap-test.sh. Default to TAP mode by modifying
our (effective) argv instead.

If you really want the default behaviour (unstructured output) this
can still be achieved by adding some arguments that are a no-op,
such as `-m quick`.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194
This commit is contained in:
Simon McVittie 2018-07-11 16:31:38 +01:00
parent 1c36fc0aa5
commit 769c367f73
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
test/test-utils-glib.c
View file

@ -603,7 +603,30 @@ set_timeout (guint factor)
void
test_init (int *argcp, char ***argvp)
{
/* If our argv only contained the executable name, assume we were
* run by Automake with LOG_COMPILER overridden by
* VALGRIND_CHECK_RULES from AX_VALGRIND_CHECK, and automatically switch
* on TAP output. This avoids needing glib-tap-test.sh. We still use
* glib-tap-test.sh in the common case because it replaces \r\n line
* endings with \n, which we need if running the tests under Wine. */
static char tap[] = "--tap";
static char *substitute_argv[] = { NULL, tap, NULL };
g_return_if_fail (argcp != NULL);
g_return_if_fail (*argcp > 0);
g_return_if_fail (argvp != NULL);
g_return_if_fail (argvp[0] != NULL);
g_return_if_fail (argvp[0][0] != NULL);
if (*argcp == 1)
{
substitute_argv[0] = (*argvp)[0];
*argcp = 2;
*argvp = substitute_argv;
}
g_test_init (argcp, argvp, NULL);
g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
set_timeout (1);
}