From 6f42c731b926c9ccb553fb3031dea34ac5bddc85 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 21 Feb 2020 10:57:42 +0000 Subject: TEST: Ensure we use __func__ for function name checking In order to cope when Check 0.13 changes the test function name in the `START_TEST()` macro, we need to use __func__ rather than open-coding the expected function names. Signed-off-by: Daniel Silverstone --- test/basictests.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/basictests.c b/test/basictests.c index c6dd9dd..2650bfe 100644 --- a/test/basictests.c +++ b/test/basictests.c @@ -83,7 +83,7 @@ START_TEST (test_nslog_trivial_corked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_corked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -109,7 +109,7 @@ START_TEST (test_nslog_trivial_uncorked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_uncorked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -150,7 +150,7 @@ START_TEST (test_nslog_two_corked_messages) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_two_corked_messages") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } END_TEST @@ -223,7 +223,7 @@ START_TEST (test_nslog_simple_filter_corked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_corked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -250,7 +250,7 @@ START_TEST (test_nslog_simple_filter_uncorked_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_uncorked_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -277,7 +277,7 @@ START_TEST (test_nslog_simple_filter_subcategory_message) "Captured message wasn't correct"); fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0, "Captured message wasn't correct filename"); - fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_subcategory_message") == 0, + fail_unless(strcmp(captured_context.funcname, __func__) == 0, "Captured message wasn't correct function name"); } @@ -524,7 +524,7 @@ END_TEST START_TEST (test_nslog_filter_funcname) { nslog_filter_t *filter; - fail_unless(nslog_filter_funcname_new("test_nslog_filter_funcname", &filter) == NSLOG_NO_ERROR, + fail_unless(nslog_filter_funcname_new(__func__, &filter) == NSLOG_NO_ERROR, "Unable to create level filter"); fail_unless(nslog_filter_set_active(filter, NULL) == NSLOG_NO_ERROR, "Unable to set active filter to dir:test"); -- cgit v1.2.3