Merge branch 'use-tap-14' into 'main'

gtestutils: Use TAP 14 syntax by default

Closes #2885

See merge request GNOME/glib!4178
This commit is contained in:
Philip Withnall 2024-08-14 13:27:04 +00:00
commit dfe5e15a0a
2 changed files with 4 additions and 6 deletions

View File

@ -65,10 +65,8 @@
#include "glib-private.h"
#include "gutilsprivate.h"
#define TAP_VERSION G_STRINGIFY (13)
/* FIXME: Remove '#' prefix when we'll depend on a meson version supporting TAP 14
* See https://gitlab.gnome.org/GNOME/glib/-/issues/2885 */
#define TAP_SUBTEST_PREFIX "# " /* a 4-space indented line */
#define TAP_VERSION G_STRINGIFY (14)
#define TAP_SUBTEST_PREFIX " " /* a 4-space indented line */
/**
* g_test_initialized:

View File

@ -35,8 +35,8 @@
#include <stdlib.h>
#include <string.h>
#define TAP_VERSION G_STRINGIFY (13)
#define TAP_SUBTEST_PREFIX "# "
#define TAP_VERSION G_STRINGIFY (14)
#define TAP_SUBTEST_PREFIX " "
/* test assertion variants */
static void