[asterisk-commits] twilson: trunk r328996 - in /trunk: ./ tests/test_netsock2.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jul 20 15:19:16 2011
New Revision: 328996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328996
Log:
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.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/tests/test_netsock2.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-2.0-merged (original)
+++ branch-2.0-merged Wed Jul 20 15:19:16 2011
@@ -1,1 +1,1 @@
-/branches/2.0:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936
+/branches/2.0:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992

Modified: trunk/tests/test_netsock2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_netsock2.c?view=diff&rev=328996&r1=328995&r2=328996
==============================================================================
--- trunk/tests/test_netsock2.c (original)
+++ trunk/tests/test_netsock2.c Wed Jul 20 15:19:16 2011
@@ -69,7 +69,6 @@
 		{ "[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 */
 	};