Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / tests / TESTLIST

diff --git a/tests/TESTLIST b/tests/TESTLIST
index b4099cafb6c5a299517f7bbdffdb095da4c3282f..3cdc7caa72635f33a1860f9a8c15d2f7f289b5c7 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -44,8 +44,12 @@ mpls-ldp-hello       mpls-ldp-hello.pcap     mpls-ldp-hello.out -t -v
 ldp_infloop    ldp-infinite-loop.pcap  ldp_infloop.out -t
 
 # OSPF tests
 ldp_infloop    ldp-infinite-loop.pcap  ldp_infloop.out -t
 
 # OSPF tests

-ospf-gmpls     ospf-gmpls.pcap         ospf-gmpls.out  -t -v
-ospf3_auth-vv  ospf3_auth.pcap         ospf3_auth-vv.out -t -v -v
+ospf-gmpls     ospf-gmpls.pcap                         ospf-gmpls.out          -t -v
+ospf3_ah-vv    OSPFv3_with_AH.pcap                     ospf3_ah-vv.out         -t -v -v
+ospf3_auth-vv  ospf3_auth.pcap                         ospf3_auth-vv.out       -t -v -v
+ospf3_bc-vv    OSPFv3_broadcast_adjacency.pcap         ospf3_bc-vv.out         -t -v -v
+ospf3_mp-vv    OSPFv3_multipoint_adjacencies.pcap      ospf3_mp-vv.out         -t -v -v
+ospf3_nbma-vv  OSPFv3_NBMA_adjacencies.pcap            ospf3_nbma-vv.out       -t -v -v

 
 # IKEv2 tests
 ikev2four      ikev2four.pcap          ikev2four.out   -t -v
 
 # IKEv2 tests
 ikev2four      ikev2four.pcap          ikev2four.out   -t -v


@@ -54,7 +58,6 @@ ikev2fourv4   ikev2four.pcap          ikev2fourv4.out -t -v -v -v -v
 # ikev2pI2 test in crypto.sh
 
 # IETF ROLL RPL packets
 # ikev2pI2 test in crypto.sh
 
 # IETF ROLL RPL packets

-dio01           rpl-dio.pcap                rpl-dio.out         -t -v

 dio02           rpl-19-pickdag.pcap         rpl-19-pickdag.out  -t -v -v
 dio03           rpl-19-pickdag.pcap         rpl-19-pickdagvvv.out  -t -v -v -v
 dao01           rpl-14-dao.pcap             rpl-14-daovvv.out    -t -v -v -v
 dio02           rpl-19-pickdag.pcap         rpl-19-pickdag.out  -t -v -v
 dio03           rpl-19-pickdag.pcap         rpl-19-pickdagvvv.out  -t -v -v -v
 dao01           rpl-14-dao.pcap             rpl-14-daovvv.out    -t -v -v -v


@@ -86,6 +89,7 @@ babel1          babel.pcap             babel1.out      -t
 babel1v         babel.pcap             babel1v.out     -t -v
 babel_auth      babel_auth.pcap        babel_auth.out  -t -v
 babel_pad1      babel_pad1.pcap        babel_pad1.out  -t
 babel1v         babel.pcap             babel1v.out     -t -v
 babel_auth      babel_auth.pcap        babel_auth.out  -t -v
 babel_pad1      babel_pad1.pcap        babel_pad1.out  -t

+babel_rtt       babel_rtt.pcap         babel_rtt.out   -t -v

 
 # PPPoE tests
 pppoe           pppoe.pcap             pppoe.out       -t
 
 # PPPoE tests
 pppoe           pppoe.pcap             pppoe.out       -t


@@ -171,14 +175,18 @@ of10_7050q-v      of10_7050q.pcap         of10_7050q-v.out        -t -v
 # GeoNetworking and CALM FAST tests
 geonet-calm-fast       geonet_and_calm_fast.pcap       geonet_and_calm_fast.out        -t -vv -n
 
 # GeoNetworking and CALM FAST tests
 geonet-calm-fast       geonet_and_calm_fast.pcap       geonet_and_calm_fast.out        -t -vv -n
 

-# NFLOG test case
-nflog-e                nflog.pcap              nflog-e.out             -t -e
+# M3UA tests
+m3ua isup.pcap isup.out -t
+m3ua-vv isup.pcap isupvv.out -t -vv
+
+# NFLOG test case moved to nflog-e.sh

 
 # syslog test case
 syslog-v       syslog_udp.pcap         syslog-v.out            -t -v
 
 #IPv6 tests
 ipv6-bad-version.pcap  ipv6-bad-version.pcap   ipv6-bad-version.out    -t
 
 # syslog test case
 syslog-v       syslog_udp.pcap         syslog-v.out            -t -v
 
 #IPv6 tests
 ipv6-bad-version.pcap  ipv6-bad-version.pcap   ipv6-bad-version.out    -t

+ipv6-routing-header    ipv6-routing-header.pcap        ipv6-routing-header.out -t -v

 
 # Loopback/CTP test case
 loopback       loopback.pcap           loopback.out            -t
 
 # Loopback/CTP test case
 loopback       loopback.pcap           loopback.out            -t


@@ -193,6 +201,12 @@ dccp_partial_csum_v6_longer        dccp_partial_csum_v6_longer.pcap        dccp_partial_csum_v
 vrrp           vrrp.pcap               vrrp.out                -t
 vrrp-v         vrrp.pcap               vrrp-v.out              -t -v
 
 vrrp           vrrp.pcap               vrrp.out                -t
 vrrp-v         vrrp.pcap               vrrp-v.out              -t -v
 

+# HSRP tests
+hsrp_1         HSRP_coup.pcap          hsrp_1.out      -t
+hsrp_1-v       HSRP_coup.pcap          hsrp_1-v.out    -t -v
+hsrp_2-v       HSRP_election.pcap      hsrp_2-v.out    -t -v
+hsrp_3-v       HSRP_failover.pcap      hsrp_3-v.out    -t -v
+

 # PIMv2 tests
 pimv2_dm-v             PIM-DM_pruning.pcap             pimv2_dm-v.out          -t -v
 pimv2_register-v       PIM_register_register-stop.pcap pimv2_register-v.out    -t -v
 # PIMv2 tests
 pimv2_dm-v             PIM-DM_pruning.pcap             pimv2_dm-v.out          -t -v
 pimv2_register-v       PIM_register_register-stop.pcap pimv2_register-v.out    -t -v


@@ -224,3 +238,20 @@ lacp-ev            LACP.pcap               lacp-ev.out             -t -e -v
 lldp_cdp-ev    LLDP_and_CDP.pcap       lldp_cdp-ev.out         -t -e -v
 cdp-v          3560_CDP.pcap           cdp-v.out               -t -v
 udld-v         UDLD.pcap               udld-v.out              -t -v
 lldp_cdp-ev    LLDP_and_CDP.pcap       lldp_cdp-ev.out         -t -e -v
 cdp-v          3560_CDP.pcap           cdp-v.out               -t -v
 udld-v         UDLD.pcap               udld-v.out              -t -v

+
+# EIGRP tests
+eigrp1-v       EIGRP_adjacency.pcap    eigrp1-v.out    -t -v
+eigrp2-v       EIGRP_goodbye.pcap      eigrp2-v.out    -t -v
+eigrp3-v       EIGRP_subnet_down.pcap  eigrp3-v.out    -t -v
+eigrp4-v       EIGRP_subnet_up.pcap    eigrp4-v.out    -t -v
+
+# IS-IS tests
+isis_1         ISIS_external_lsp.pcap          isis_1.out      -t
+isis_1-v       ISIS_external_lsp.pcap          isis_1-v.out    -t -v
+isis_2-v       ISIS_level1_adjacency.pcap      isis_2-v.out    -t -v
+isis_3-v       ISIS_level2_adjacency.pcap      isis_3-v.out    -t -v
+isis_4-v       ISIS_p2p_adjacency.pcap         isis_4-v.out    -t -v
+
+# ATA-over-Ethernet tests
+aoe_1          AoE_Linux.pcap          aoe_1.out       -t
+aoe_1-v                AoE_Linux.pcap          aoe_1-v.out     -t -v