From 05d81f03f6f4dad89c4acb7f275337fa3d6ebfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 2 Aug 2024 09:26:34 +0200 Subject: [PATCH] gtestutils: Use TAP 14 syntax by default The issue of meson 60 have been resolved for some time now, so we can just use newer TAP syntax safely. Revert "gtestutils: Use TAP 13 comments syntax for subtests" This reverts commit e8725407bcd35c1fa8fed92250edf080d5542b3c. Closes: #2885 --- glib/gtestutils.c | 6 ++---- glib/tests/testing.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/glib/gtestutils.c b/glib/gtestutils.c index ab7f1e1bc..a2910303d 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -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: diff --git a/glib/tests/testing.c b/glib/tests/testing.c index c4179eb4a..8a49e69aa 100644 --- a/glib/tests/testing.c +++ b/glib/tests/testing.c @@ -35,8 +35,8 @@ #include #include -#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