Changeset 11f2df7

Timestamp:

04/02/07 22:02:45 (14 years ago)

Author:

Perry Lorier <perry@…>

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:

3d84f6a

Parents:

73dd29f

Message:

Add more tests for tsh

File:

• test/Makefile (modified) (2 diffs)

test/Makefile

@@ -50 +50 @@
         DYLD_LIBRARY_PATH="$(libdir)" \
         ./test-decode2 pcap:traces/radius.pcap
-        @for i in erf pcap wtf pcapfile duck legacyatm legacyeth legacypos; do \
+        @for i in erf pcap wtf pcapfile duck legacyatm legacyeth legacypos tsh;\
+        do \
                 echo \* Read $$i;                               \
                 rm -f traces/*.out.*;                           \
@@ -102 +103 @@
         #@rm -f traces/*.out.*
         #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert wtf wtf
-        #@echo " * legacyatm -> pcapfile"
-        #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacyatm pcapfile
+
+        @# This doesn't work because pcap doesn't support legacyatm's linketype
+        @# so the packet is converted to a raw IP packet, which when read
+        @# back in again doesn't match legacyatm's original packet.
+        @#echo " * legacyatm -> pcapfile"
+        @#rm -f traces/*.out.*
+        @#LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacyatm pcapfile
+
         @echo " * legacyeth -> pcapfile"
         @rm -f traces/*.out.*
         @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacyeth pcapfile
-        #@echo " * legacypos -> pcapfile"
-        #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacypos pcapfile
-        #@echo " * duck -> duck"
-        #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert duck duck
+
+        @echo " * legacypos -> pcapfile"
+        @rm -f traces/*.out.*
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacypos pcapfile
+
+        @echo " * duck -> duck"
+        @rm -f traces/*.out.*
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert duck duck
+
+        @echo " * tsh -> pcapfile"
+        @rm -f traces/*.out.*
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert tsh pcapfile
+        @echo " * tsh -> pcap"
+        @rm -f traces/*.out.*
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert tsh pcap
  
 clean: