Changeset 99425f8

Timestamp:

03/10/11 16:26:07 (10 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

eff6d8c

Parents:

4c90362

Message:

• Added a new test for an SLL trace where the Ethernet header has NOT been included in the capture
• Check tracesets test now just checks a single trace from each set by default

Location:

test

Files:

• do-check-tracesets.sh (modified) (13 diffs)
• do-tests.sh (modified) (1 diff)
• test-event.c (modified) (1 diff)
• traces/sll.pcap.gz (added)

test/do-check-tracesets.sh

@@ -13 +13 @@
         echo -n " * $i: "
         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -20 +21 @@
         echo -n " * $i: "
         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -27 +29 @@
         echo -n " * $i: "
         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 for i in ${PREFIX}/auckland/6/*-e[01].gz; do
         echo -n " * $i: "
         ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -38 +42 @@
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -45 +50 @@
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -52 +58 @@
         echo -n " * $i: "
         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -59 +66 @@
         echo -n " * $i: "
         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -66 +74 @@
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -73 +82 @@
         echo -n " * $i: "
         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -80 +90 @@
         echo -n " * $i: "
         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 for i in ${PREFIX}/pma/long/leip/2/*-e.gz; do
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -91 +103 @@
         echo -n " * $i: "
         ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -98 +111 @@
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 
@@ -106 +120 @@
         echo -n " * $i: "
         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+        break
 done
 

test/do-tests.sh

@@ -18 +18 @@
 echo SLL Decoder 
 do_test ./test-decode2 pcap:traces/100_sll.pcap
+do_test ./test-decode2 pcapfile:traces/sll.pcap.gz
 
 echo 802.1x decoder

test/test-event.c

@@ -100 +100 @@
                 iferr(trace);
         }
-        trace_destroy_packet(packet);
+        if (packet)
+                trace_destroy_packet(packet);
         if (error == 0) {
                 if (count == 100) {