colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib-aux/tests: expose current test name that is running under nmtst_add_test_func_full*()

Browse Source
This commit is contained in:
Thomas Haller
2023-01-04 13:59:53 +01:00
parent 3cd02b6ed6
commit 6850766679
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/libnm-glib-aux/nm-test-utils.h
View File

@@ -225,16 +225,17 @@
/*****************************************************************************/ /*****************************************************************************/
struct __nmtst_internal { struct __nmtst_internal {
GRand *rand0; GRand *rand0;
guint32 rand_seed; guint32 rand_seed;
GRand *rand; GRand *rand;
gboolean is_debug; gboolean is_debug;
gboolean assert_logging; gboolean assert_logging;
gboolean no_expect_message; gboolean no_expect_message;
gboolean test_quick; gboolean test_quick;
gboolean test_tap_log; gboolean test_tap_log;
char *sudo_cmd; char *sudo_cmd;
char **orig_argv; char **orig_argv;
const char *testpath;
}; };
extern struct __nmtst_internal __nmtst_internal; extern struct __nmtst_internal __nmtst_internal;
@@ -810,6 +811,22 @@ _nmtst_test_data_unpack(const NmtstTestData *test_data, gsize n_args, ...)
#define nmtst_test_data_unpack(test_data, ...) \ #define nmtst_test_data_unpack(test_data, ...) \
_nmtst_test_data_unpack(test_data, NM_NARG(__VA_ARGS__), ##__VA_ARGS__) _nmtst_test_data_unpack(test_data, NM_NARG(__VA_ARGS__), ##__VA_ARGS__)
static inline const char *
nmtst_test_get_path(void)
{
g_assert(nmtst_initialized());
g_assert(__nmtst_internal.testpath);
/* Similar to g_test_get_path() (which only exists since glib 2.68).
*
* This is the test name while running the test added with
* nmtst_add_test_func*().
*
* You are only allowed to call this from inside such a test. */
return __nmtst_internal.testpath;
}
static inline void static inline void
_nmtst_test_data_free(gpointer data) _nmtst_test_data_free(gpointer data)
{ {
@@ -826,6 +843,13 @@ _nmtst_test_run(gconstpointer data)
{ {
const NmtstTestData *test_data = data; const NmtstTestData *test_data = data;
g_assert(test_data);
g_assert(nmtst_initialized());
g_assert(test_data->testpath);
g_assert(!__nmtst_internal.testpath);
__nmtst_internal.testpath = test_data->testpath;
if (test_data->_func_setup) if (test_data->_func_setup)
test_data->_func_setup(test_data); test_data->_func_setup(test_data);
@@ -833,6 +857,10 @@ _nmtst_test_run(gconstpointer data)
if (test_data->_func_teardown) if (test_data->_func_teardown)
test_data->_func_teardown(test_data); test_data->_func_teardown(test_data);
g_assert(__nmtst_internal.testpath);
g_assert(__nmtst_internal.testpath == test_data->testpath);
__nmtst_internal.testpath = NULL;
} }
static inline void static inline void