From 94bbe2a70165acb7af61ceab57ac1e3c4989f971 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 8 Jul 2011 16:00:46 +0000 Subject: Merged revisions 327046 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r327046 | russell | 2011-07-08 11:00:05 -0500 (Fri, 08 Jul 2011) | 2 lines Fix an error and add more log message info to help see why this fails on FreeBSD. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327047 f38db490-d61c-443f-a65b-d21fe96a405b --- tests/test_netsock2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/test_netsock2.c') diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c index 3bbf25770..f759ed2ce 100644 --- a/tests/test_netsock2.c +++ b/tests/test_netsock2.c @@ -101,7 +101,9 @@ AST_TEST_DEFINE(parsing) tmp = ast_sockaddr_stringify(&addr); ast_sockaddr_parse(&tmp_addr, tmp, 0); if (ast_sockaddr_cmp_addr(&addr, &tmp_addr)) { - ast_test_status_update(test, "Re-parsed stringification did not match: '%s' vs '%s'\n", ast_sockaddr_stringify(&addr), ast_sockaddr_stringify(&tmp_addr)); + char buf[64]; + ast_copy_string(buf, ast_sockaddr_stringify(&addr), sizeof(buf)); + ast_test_status_update(test, "Re-parsed stringification of '%s' did not match: '%s' vs '%s'\n", test_vals[x].address, buf, ast_sockaddr_stringify(&tmp_addr)); res = AST_TEST_FAIL; } } -- cgit v1.2.3 From b8c96cbf21f203e87181e243516de53130165ca5 Mon Sep 17 00:00:00 2001 From: twilson Date: Wed, 20 Jul 2011 20:19:16 +0000 Subject: Merged revisions 328992 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/2.0 ................ r328992 | twilson | 2011-07-20 15:18:25 -0500 (Wed, 20 Jul 2011) | 12 lines Merged revisions 328987 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r328987 | twilson | 2011-07-20 15:16:58 -0500 (Wed, 20 Jul 2011) | 5 lines We can't guarantee an eth0 is present FreeBSD test fails on this case presumably because there is no eth0 on the test machine. Better to just remove this test for now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328996 f38db490-d61c-443f-a65b-d21fe96a405b --- tests/test_netsock2.c | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/test_netsock2.c') diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c index f759ed2ce..8d7e1ebd8 100644 --- a/tests/test_netsock2.c +++ b/tests/test_netsock2.c @@ -69,7 +69,6 @@ AST_TEST_DEFINE(parsing) { "[2001::1]", 1 }, { "[2001:0000:4136:e378:8000:63bf:3fff:fdd2]:5060", 1 }, { "2001:0000:4136:e378:8000:63bf:3fff:fdd2:5060", 0 }, /* port, but no brackets */ - { "[fe80::200:5aee:feaa:20a2%eth0]", 1 }, /* link-local with scope id */ { "[fe80::200::abcd", 0 }, /* multiple zero expansions */ }; -- cgit v1.2.3