From: Ajith Adapa <adapa.ajith@gmail.com>
Date: Thu, 7 Feb 2013 05:24:02 +0000 (+0530)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: tcpdump-4.4.0~3^2~1
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/6fa35c192ef098b63de6e7373f999a8376c52574?ds=sidebyside;hp=-c

Merge remote branch 'upstream/master'
---

6fa35c192ef098b63de6e7373f999a8376c52574
diff --combined tests/TESTLIST
index 8d638ae8,40803431..90157dbd
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@@ -66,14 -66,17 +66,20 @@@ babel_auth      babel_auth.pcap        
  pppoe           pppoe.pcap             pppoe.out       -t
  
  # ICMPv6
- icmpv6          icmpv6.pcap             icmpv6.out      -t -vv -c1
+ icmpv6          icmpv6.pcap             icmpv6.out      -t -vv
  
  # SPB tests
  spb	            spb.pcap	            spb.out -t
  
 +# SPB BPDUv4 tests
 +spb_bpduv4      spb_bpduv4.pcap       spb_bpduv4.out -t
 +
  # RIP tests
  ripv1v2         ripv1v2.pcap            ripv1v2.out     -t -v
  ripv2_auth      ripv2_auth.pcap         ripv2_auth.out  -t -v
+ 
+ # DHCPv6 tests
+ dhcpv6-aftr-name	dhcpv6-AFTR-Name-RFC6334.pcap	dhcpv6-AFTR-Name-RFC6334.out	-t -v
+ dhcpv6-ia-na	dhcpv6-ia-na.pcap	dhcpv6-ia-na.out	-t -v
+ dhcpv6-ia-pd	dhcpv6-ia-pd.pcap	dhcpv6-ia-pd.out	-t -v
+ dhcpv6-ia-ta	dhcpv6-ia-ta.pcap	dhcpv6-ia-ta.out	-t -v