Changeset 573ea8e

Timestamp:

07/16/10 11:44:38 (11 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:

04a0ba4

Parents:

53f179f

Message:

• Streamlined the WITS traceset test to be "nice"

Location:

test

Files:

• Makefile (modified) (1 diff)
• do-check-tracesets.sh (modified) (5 diffs)
• test-convert2.c (added)

test/Makefile

@@ -15 +15 @@
 .PHONY: all clean distclean install depend test
 
-all: $(BINS) test-drops test-format test-decode test-decode2 test-write test-convert
+all: $(BINS) test-drops test-format test-decode test-decode2 test-write test-convert test-convert2
 
 clean:
         $(RM) $(BINS) $(OBJS) test-format  test-decode test-convert \
-        test-decode2 test-write test-drops
+        test-decode2 test-write test-drops test-convert2
 
 distclean:
-        $(RM) $(BINS) $(OBJS) test-format test-decode test-convert test-drops
+        $(RM) $(BINS) $(OBJS) test-format test-decode test-convert test-drops test-convert2
 
 install:

test/do-check-tracesets.sh

@@ -1 +1 @@
 #!/bin/bash
 
-PREFIX=${1:-/trace/}
+PREFIX=${1:-/trace/mojo-public}
 TEST=./test-convert2
 export LD_LIBRARY_PATH=../lib/.libs:../libpacketdump/.libs
 export LIBTRACEIO=directread
 
-# Abilene 1
-echo Testing Abilene I
-for i in ${PREFIX}/pma/long/ipls/1/*.gz; do
-        echo -n " * $i: "
-        ${TEST} legacypos:$i pcapfile && echo PASS
-done
 
 # Auckland I
@@ -19 +13 @@
 for i in ${PREFIX}/auckland/2/*.gz; do
         echo -n " * $i: "
-        ${TEST} legacyatm:$i pcapfile && echo PASS
+        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
 done
 
@@ -26 +20 @@
 for i in ${PREFIX}/auckland/4/*.gz; do
         echo -n " * $i: "
-        ${TEST} legacyatm:$i pcapfile && echo PASS
+        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
 done
 
@@ -33 +27 @@
 for i in ${PREFIX}/auckland/6/*-[01].gz; do
         echo -n " * $i: "
-        ${TEST} legacyatm:$i pcapfile && echo PASS
+        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
 done
 for i in ${PREFIX}/auckland/6/*-e[01].gz; do
         echo -n " * $i: "
-        ${TEST} legacyeth:$i pcapfile && echo PASS
+        ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
 done
 
@@ -44 +38 @@
 for i in ${PREFIX}/auckland/8/*.gz; do
         echo -n " * $i: "
-        ${TEST} erf:$i pcapfile && echo PASS
+        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
+
+# Auckland IX
+echo Testing Auckland IX
+for i in ${PREFIX}/auckland/9/*.gz; do
+        echo -n " * $i: "
+        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
+
+# IPLS I
+echo Testing IPLS I
+for i in ${PREFIX}/pma/long/ipls/1/*.gz; do
+        echo -n " * $i: "
+        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
+
+# IPLS II
+echo Testing IPLS II
+for i in ${PREFIX}/pma/long/ipls/2/*.gz; do
+        echo -n " * $i: "
+        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
+
+# IPLS III
+echo Testing IPLS III
+for i in ${PREFIX}/pma/long/ipls/3/*.gz; do
+        echo -n " * $i: "
+        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
 done
 
 # Leipzig I
-
-# IPLS I (Abiline I?)
+echo Testing Leipzig I 
+for i in ${PREFIX}/pma/long/leip/1/*.gz; do
+        echo -n " * $i: "
+        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
 
 # Leipzig II
+echo Testing Leipzig II 
+for i in ${PREFIX}/pma/long/leip/2/*-[01].gz; do
+        echo -n " * $i: "
+        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+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
+done
 
 # NZIX II
+echo Testing NZIX II 
+for i in ${PREFIX}/pma/long/nzix/2/*.gz; do
+        echo -n " * $i: "
+        ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
 
 # SDSC I
+echo Testing SDSC I
+for i in ${PREFIX}/pma/long/sdag/1/*.gz; do
+        echo -n " * $i: "
+        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
 
-# Waikato I,II,II,IV
+
+# Waikato I
+echo Testing Waikato I
+for i in ${PREFIX}/waikato/1/*[0-9].gz; do
+        echo -n " * $i: "
+        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
+done
+
+
+echo Testing complete