commit 68ff61759ce7f92f2e775268ae7d2eab3a4a70fb parent 8a2adbc350cd0fede21546323dd684167f9c9d0d Author: Kyle Milz <kyle@0x30.net> Date: Fri, 19 Aug 2016 23:26:45 -0600 tt: get nmap passing Diffstat:
| A | tt/nmap.sh | | | 150 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| D | tt/nmap.t | | | 149 | ------------------------------------------------------------------------------- |
2 files changed, 150 insertions(+), 149 deletions(-)
diff --git a/tt/nmap.sh b/tt/nmap.sh @@ -0,0 +1,150 @@ +# +# Instruments Nmap and checks that the instrumented program still runs. +# +echo 1..7 +. test/package.sh "net/nmap" + +pkg_check_deps 2 +pkg_clean 3 +pkg_build 4 + +cat <<EOF > check.good +Summary: + 528 Calls to the rewrite tool + 388 Source files used as input + 78 Application link commands + 598 Rewrite parse warnings + 74 Rewrite parse errors + 322 Rewrite successes + 66 Rewrite failures + 299 Rewritten source compile successes + 23 Rewritten source compile failures + +Totals: + 171607 Lines of source code + 3749 Function definitions + 8003 If statements + 822 For loops + 403 While loops + 56 Do while loops + 282 Switch statements + 4485 Return statement values + 17229 Call expressions + 294597 Total statements + 20377 Binary operators + 586 Errors rewriting source +EOF +pkg_check 5 + +cat <<EOF > filelist.good +./fad-getad.c 281 +./gencode.c 8905 +./inet.c 1142 +./nametoaddr.c 510 +./optimize.c 2356 +./pcap-bpf.c 2753 +./pcap-common.c 1387 +./pcap.c 2030 +./savefile.c 417 +./sf-pcap-ng.c 1275 +./sf-pcap.c 895 +ARPHeader.cc 378 +DestOptsHeader.cc 160 +EthernetHeader.cc 284 +FragmentHeader.cc 277 +HopByHopHeader.cc 452 +ICMPv4Header.cc 1252 +ICMPv6Header.cc 1423 +IPv4Header.cc 699 +IPv6Header.cc 570 +PacketElement.cc 135 +PacketParser.cc 1858 +RawData.cc 237 +RoutingHeader.cc 374 +TCPHeader.cc 1001 +Target.cc 578 +TargetGroup.cc 819 +TransportLayerElement.cc 190 +UDPHeader.cc 363 +addr-util.c 305 +addr.c 493 +arp-bsd.c 324 +bpf_filter.c 760 +daxpy.c 50 +ddot.c 51 +dnrm2.c 63 +dscal.c 45 +engine_kqueue.c 371 +engine_poll.c 428 +engine_select.c 394 +eth-bsd.c 173 +filespace.c 119 +gh_heap.c 251 +grammar.c 754 +intf.c 1088 +ip-util.c 218 +ip6.c 77 +main.cc 230 +nbase_addrset.c 651 +nbase_memalloc.c 179 +nbase_misc.c 955 +nbase_rnd.c 424 +nbase_str.c 380 +netutils.c 198 +nse_binlib.cc 414 +nse_bit.cc 75 +nse_debug.cc 103 +nse_dnet.cc 368 +nse_fs.cc 313 +nse_lpeg.cc 8 +nse_main.cc 823 +nse_nmaplib.cc 1027 +nse_nsock.cc 1137 +nse_openssl.cc 610 +nse_pcrelib.cc 405 +nse_ssl_cert.cc 612 +nse_utility.cc 206 +nsock_connect.c 561 +nsock_core.c 1416 +nsock_engines.c 160 +nsock_event.c 543 +nsock_iod.c 449 +nsock_log.c 121 +nsock_pcap.c 495 +nsock_pool.c 311 +nsock_proxy.c 460 +nsock_read.c 135 +nsock_ssl.c 186 +nsock_timers.c 81 +nsock_write.c 237 +protocols.cc 252 +proxy_http.c 215 +proxy_socks4.c 246 +route-bsd.c 693 +scan_engine.cc 2753 +scan_engine_connect.cc 564 +scan_engine_raw.cc 2279 +scanner.c 460 +service_scan.cc 2818 +services.cc 578 +targets.cc 729 +tcpip.cc 2172 +timing.cc 780 +traceroute.cc 1660 +tron.cpp 236 +utils.cc 721 +xml.cc 463 +EOF + +$TEST_WRKDIST/nmap krwm.net & +pid=$! + +sleep 2 +$TEST_TOOLS/citrun-dump +$TEST_TOOLS/citrun-dump -f > filelist.out +filelist_diff 6 + +kill $pid +wait + +pkg_clean 7 diff --git a/tt/nmap.t b/tt/nmap.t @@ -1,149 +0,0 @@ -#!/bin/sh -e -# -# Instruments Nmap and checks that the instrumented program still runs. -# -echo 1..5 -. test/package.sh - -pkg_instrument "net/nmap" - -cat <<EOF > check.good -Summary: - 528 Calls to the rewrite tool - 388 Source files used as input - 78 Application link commands - 598 Rewrite parse warnings - 74 Rewrite parse errors - 322 Rewrite successes - 66 Rewrite failures - 299 Rewritten source compile successes - 23 Rewritten source compile failures - -Totals: - 171607 Lines of source code - 3749 Function definitions - 8003 If statements - 822 For loops - 403 While loops - 56 Do while loops - 282 Switch statements - 4485 Return statement values - 17229 Call expressions - 294597 Total statements - 20377 Binary operators - 586 Errors rewriting source -EOF -pkg_check 4 - -cat <<EOF > filelist.good -./fad-getad.c 281 -./gencode.c 8905 -./inet.c 1142 -./nametoaddr.c 510 -./optimize.c 2356 -./pcap-bpf.c 2753 -./pcap-common.c 1387 -./pcap.c 2030 -./savefile.c 417 -./sf-pcap-ng.c 1275 -./sf-pcap.c 895 -ARPHeader.cc 378 -DestOptsHeader.cc 160 -EthernetHeader.cc 284 -FragmentHeader.cc 277 -HopByHopHeader.cc 452 -ICMPv4Header.cc 1252 -ICMPv6Header.cc 1423 -IPv4Header.cc 699 -IPv6Header.cc 570 -PacketElement.cc 135 -PacketParser.cc 1858 -RawData.cc 237 -RoutingHeader.cc 374 -TCPHeader.cc 1001 -Target.cc 578 -TargetGroup.cc 819 -TransportLayerElement.cc 190 -UDPHeader.cc 363 -addr-util.c 305 -addr.c 493 -arp-bsd.c 324 -bpf_filter.c 760 -daxpy.c 50 -ddot.c 51 -dnrm2.c 63 -dscal.c 45 -engine_kqueue.c 371 -engine_poll.c 428 -engine_select.c 394 -eth-bsd.c 173 -filespace.c 119 -gh_heap.c 251 -grammar.c 754 -intf.c 1088 -ip-util.c 218 -ip6.c 77 -main.cc 230 -nbase_addrset.c 651 -nbase_memalloc.c 179 -nbase_misc.c 955 -nbase_rnd.c 424 -nbase_str.c 380 -netutils.c 198 -nse_binlib.cc 414 -nse_bit.cc 75 -nse_debug.cc 103 -nse_dnet.cc 368 -nse_fs.cc 313 -nse_lpeg.cc 8 -nse_main.cc 823 -nse_nmaplib.cc 1027 -nse_nsock.cc 1137 -nse_openssl.cc 610 -nse_pcrelib.cc 405 -nse_ssl_cert.cc 612 -nse_utility.cc 206 -nsock_connect.c 561 -nsock_core.c 1416 -nsock_engines.c 160 -nsock_event.c 543 -nsock_iod.c 449 -nsock_log.c 121 -nsock_pcap.c 495 -nsock_pool.c 311 -nsock_proxy.c 460 -nsock_read.c 135 -nsock_ssl.c 186 -nsock_timers.c 81 -nsock_write.c 237 -protocols.cc 252 -proxy_http.c 215 -proxy_socks4.c 246 -route-bsd.c 693 -scan_engine.cc 2753 -scan_engine_connect.cc 564 -scan_engine_raw.cc 2279 -scanner.c 460 -service_scan.cc 2818 -services.cc 578 -targets.cc 729 -tcpip.cc 2172 -timing.cc 780 -traceroute.cc 1660 -tron.cpp 236 -utils.cc 721 -xml.cc 463 -EOF - -$TEST_WRKDIST/nmap krwm.net & -pid=$! - -sleep 1 -$TEST_TOOLS/citrun-dump -$TEST_TOOLS/citrun-dump -f > filelist.out -filelist_diff 5 - -kill $pid -wait - -pkg_clean