Changeset 4631115 for test

Timestamp:

02/13/15 13:23:34 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

de74f88

Parents:

0b01fea (diff), 92d5f15 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into develop.

Update to include fixes/features etc from the 3.0.22 release.

Conflicts:

README
lib/format_dag25.c
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c
test/Makefile

Location:

test

Files:

• Makefile (modified) (2 diffs)
• do-tests.sh (modified) (1 diff)
• test-vxlan.c (added)
• traces/vxlan.pcap (added)

test/Makefile

@@ -9 +9 @@
 CFLAGS += $(INCLUDE)
 libdir = $(PREFIX)/lib/.libs:$(PREFIX)/libpacketdump/.libs
-LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump 
+LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump
 
 BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque \
@@ -18 +18 @@
 
 BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \
-        test-plen test-autodetect test-ports test-fragment test-live test-live-snaplen \
-        $(BINS_DATASTRUCT) $(BINS_PARALLEL)
+        test-plen test-autodetect test-ports test-fragment test-live \
+        test-live-snaplen test-vxlan $(BINS_DATASTRUCT) $(BINS_PARALLEL)
 
 .PHONY: all clean distclean install depend test

test/do-tests.sh

@@ -230 +230 @@
 do_test ./test-autodetect traces/5_packets.erf.xz
 
+echo " * VXLan decode"
+do_test ./test-vxlan
+
 echo
 echo "Tests passed: $OK"