Gitweb links:
...log
http://git.netsurf-browser.org/libnslog.git/shortlog/6f42c731b926c9ccb553fb3031dea34ac5bddc85
...commit
http://git.netsurf-browser.org/libnslog.git/commit/6f42c731b926c9ccb553fb3031dea34ac5bddc85
...tree
http://git.netsurf-browser.org/libnslog.git/tree/6f42c731b926c9ccb553fb3031dea34ac5bddc85
The branch, master has been updated
via 6f42c731b926c9ccb553fb3031dea34ac5bddc85 (commit)
from a9e47c8ccb2eefbc707ee5b13dffef29cf8bdb5d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libnslog.git/commit/?id=6f42c731b926c9ccb553fb3031dea34ac5bddc85
commit 6f42c731b926c9ccb553fb3031dea34ac5bddc85
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
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 <[email protected]>
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");
-----------------------------------------------------------------------
Summary of changes:
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");
--
NetSurf Parametric Logging Library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
